From b7a5ae38c58cc9a1973febfce40c5f076ff5d772 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 26 Mar 2012 09:48:58 +0200 Subject: [PATCH] fix sql command in calendar's share lib --- apps/calendar/lib/share.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php index a5ca0a6e73..def1026c5e 100644 --- a/apps/calendar/lib/share.php +++ b/apps/calendar/lib/share.php @@ -21,7 +21,7 @@ class OC_Calendar_Share{ $group_where = self::group_sql(OC_Group::getUserGroups($userid)); $permission_where = self::permission_sql($permission); $active_where = self::active_sql($active); - $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . $type . ' WHERE ((share = ? AND sharetype = "user") ' . $group_where . ') AND owner <> ? ' . $permission_where . ' ' . $active_where . ')'); + $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . $type . ' WHERE ((share = ? AND sharetype = "user") ' . $group_where . ') AND owner <> ? ' . $permission_where . ' ' . $active_where); $result = $stmt->execute(array($userid, $userid)); $return = array(); while( $row = $result->fetchRow()){ @@ -168,8 +168,8 @@ class OC_Calendar_Share{ private static function permission_sql($permission = null){ $permission_where = ''; if(!is_null($permission)){ - $permission_where = 'AND permissions = '; - $permission_where .= ($permission=='rw')?'1':'0'; + $permission_where = ' AND permissions = '; + $permission_where .= ($permission=='rw')?'"1"':'"0"'; } return $permission_where; }