diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-07-27 11:40:51 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-07-27 11:40:51 +0200 |
| commit | a7a54331082c41c5b05cd7982c058caf1556f777 (patch) | |
| tree | bc51551c2430837856cdb1f3a1e04c46e0f664cb /lib/group/database.php | |
| parent | e8010209bb1ec8ef9ecc1cff7ac2b2d4d414bd74 (diff) | |
| parent | d26f87e738314db7820f39f74f42865ff20f7bd7 (diff) | |
| download | nextcloud-server-a7a54331082c41c5b05cd7982c058caf1556f777.tar.gz nextcloud-server-a7a54331082c41c5b05cd7982c058caf1556f777.zip | |
Merge branch 'master' into chunked_upload
Conflicts:
lib/connector/sabre/directory.php
Diffstat (limited to 'lib/group/database.php')
| -rw-r--r-- | lib/group/database.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/group/database.php b/lib/group/database.php index fb173665eb8..2770ec185c4 100644 --- a/lib/group/database.php +++ b/lib/group/database.php @@ -41,7 +41,6 @@ * Class for group management in a SQL Database (e.g. MySQL, SQLite) */ class OC_Group_Database extends OC_Group_Backend { - private $userGroupCache=array(); /** * @brief Try to create a new group @@ -116,7 +115,7 @@ class OC_Group_Database extends OC_Group_Backend { // No duplicate entries! if( !$this->inGroup( $uid, $gid )){ $query = OC_DB::prepare( "INSERT INTO `*PREFIX*group_user` ( `uid`, `gid` ) VALUES( ?, ? )" ); - $result = $query->execute( array( $uid, $gid )); + $query->execute( array( $uid, $gid )); return true; }else{ return false; @@ -133,7 +132,7 @@ class OC_Group_Database extends OC_Group_Backend { */ public function removeFromGroup( $uid, $gid ){ $query = OC_DB::prepare( "DELETE FROM *PREFIX*group_user WHERE uid = ? AND gid = ?" ); - $result = $query->execute( array( $uid, $gid )); + $query->execute( array( $uid, $gid )); return true; } |