diff options
author | Daniel <daniel@mars.(none)> | 2012-05-06 16:13:13 +0200 |
---|---|---|
committer | Daniel <daniel@mars.(none)> | 2012-05-06 16:13:13 +0200 |
commit | 35177e00c008c23d1fdfa641ec20a0a941ebc1b0 (patch) | |
tree | db4af603d1f0c1fb3e53066288386372dc230921 /lib | |
parent | bede32be2445f609506b018deaa167dfb731399f (diff) | |
parent | fd16784bcc4ffbd677d17f423d18ff60dc110f1e (diff) | |
download | nextcloud-server-35177e00c008c23d1fdfa641ec20a0a941ebc1b0.tar.gz nextcloud-server-35177e00c008c23d1fdfa641ec20a0a941ebc1b0.zip |
Merge commit 'refs/merge-requests/109' of git://gitorious.org/owncloud/owncloud into merge-requests/109
Diffstat (limited to 'lib')
-rw-r--r-- | lib/migrate.php | 2 | ||||
-rw-r--r-- | lib/user/database.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/migrate.php b/lib/migrate.php index f46d860e806..99926171b77 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -457,7 +457,7 @@ class OC_Migrate{ ); // Add hash if user export if( self::$exporttype == 'user' ){ - $query = OC_DB::prepare( "SELECT password FROM *PREFIX*users WHERE uid LIKE ?" ); + $query = OC_DB::prepare( "SELECT password FROM *PREFIX*users WHERE uid = ?" ); $result = $query->execute( array( self::$uid ) ); $row = $result->fetchRow(); $hash = $row ? $row['password'] : false; diff --git a/lib/user/database.php b/lib/user/database.php index c1bac1bb0b5..4738a8948cb 100644 --- a/lib/user/database.php +++ b/lib/user/database.php @@ -122,7 +122,7 @@ class OC_User_Database extends OC_User_Backend { * Check if the password is correct without logging in the user */ public function checkPassword( $uid, $password ){ - $query = OC_DB::prepare( "SELECT uid, password FROM *PREFIX*users WHERE uid LIKE ?" ); + $query = OC_DB::prepare( "SELECT uid, password FROM *PREFIX*users WHERE uid = ?" ); $result = $query->execute( array( $uid)); $row=$result->fetchRow(); @@ -172,7 +172,7 @@ class OC_User_Database extends OC_User_Backend { * @return boolean */ public function userExists($uid){ - $query = OC_DB::prepare( "SELECT * FROM `*PREFIX*users` WHERE uid LIKE ?" ); + $query = OC_DB::prepare( "SELECT * FROM `*PREFIX*users` WHERE uid = ?" ); $result = $query->execute( array( $uid )); return $result->numRows() > 0; |