diff options
| author | Frank Karlitschek <karlitschek@kde.org> | 2011-04-16 23:09:02 +0200 |
|---|---|---|
| committer | Frank Karlitschek <karlitschek@kde.org> | 2011-04-16 23:09:02 +0200 |
| commit | af40d872ce8b815afa2e8ace6db6fc544f12e42f (patch) | |
| tree | 78ed73e3797bd6f7d9aad0023de04c667a3ce1d5 | |
| parent | fc63882fe2bcbacd1ec880c9f689da3a334c51cb (diff) | |
| parent | 7035c0417ce2aef3577d9f5477e912595dcdb4a8 (diff) | |
| download | nextcloud-server-af40d872ce8b815afa2e8ace6db6fc544f12e42f.tar.gz nextcloud-server-af40d872ce8b815afa2e8ace6db6fc544f12e42f.zip | |
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
| -rw-r--r-- | docs/owncloud.sql | 1 | ||||
| -rw-r--r-- | lib/User/database.php | 2 | ||||
| -rw-r--r-- | lib/database.php | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/docs/owncloud.sql b/docs/owncloud.sql index 75812ad3c7e..78fa42979b2 100644 --- a/docs/owncloud.sql +++ b/docs/owncloud.sql @@ -165,7 +165,6 @@ CREATE TABLE IF NOT EXISTS `properties` ( CREATE TABLE IF NOT EXISTS `users` ( `uid` varchar(64) COLLATE utf8_unicode_ci NOT NULL, - `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL, `password` varchar(255) COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`uid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; diff --git a/lib/User/database.php b/lib/User/database.php index d521cc23c42..f0b68cf17d7 100644 --- a/lib/User/database.php +++ b/lib/User/database.php @@ -71,7 +71,7 @@ class OC_USER_DATABASE extends OC_USER_BACKEND { * @param string $password The password of the user */ public static function login( $username, $password ){ - $query = OC_DB::prepare( "SELECT `uid`, `name` FROM `*PREFIX*users` WHERE `uid` = ? AND `password` = ?" ); + $query = OC_DB::prepare( "SELECT `uid` FROM `*PREFIX*users` WHERE `uid` = ? AND `password` = ?" ); $result = $query->execute( array( $username, sha1( $password ))); if( $result->numRows() > 0 ){ diff --git a/lib/database.php b/lib/database.php index dc4bf75649b..b620009bf50 100644 --- a/lib/database.php +++ b/lib/database.php @@ -152,7 +152,7 @@ class OC_DB { // Die if we have an error (error means: bad query, not 0 results!) if( PEAR::isError($result)) { $entry = 'DB Error: "'.$result->getMessage().'"<br />'; - $entry .= 'Offending command was: '.$cmd.'<br />'; + $entry .= 'Offending command was: '.$query.'<br />'; error_log( $entry ); die( $entry ); } |