https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113182
Revision: 113182
Author: ialex
Date: 2012-03-06 21:35:03 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
Use common methods to make database requests (DatabaseBase::select() and
DatabaseBase::selectRow()) instead of DatabaseBase::safeQuery()
Modified Paths:
--------------
trunk/extensions/CentralAuth/CentralAuthUser.php
Modified: trunk/extensions/CentralAuth/CentralAuthUser.php
===================================================================
--- trunk/extensions/CentralAuth/CentralAuthUser.php 2012-03-06 21:31:31 UTC
(rev 113181)
+++ trunk/extensions/CentralAuth/CentralAuthUser.php 2012-03-06 21:35:03 UTC
(rev 113182)
@@ -163,15 +163,18 @@
$globaluser = $dbr->tableName( 'globaluser' );
$localuser = $dbr->tableName( 'localuser' );
- $sql =
- "SELECT gu_id, lu_wiki, gu_salt,
gu_password,gu_auth_token, " .
- "gu_locked,gu_hidden, gu_registration, gu_email, " .
- "gu_email_authenticated, gu_home_db " .
- "FROM $globaluser " .
- "LEFT OUTER JOIN $localuser ON gu_name=lu_name AND
lu_wiki=? " .
- "WHERE gu_name=?";
- $result = $dbr->safeQuery( $sql, wfWikiID(), $this->mName );
- $row = $dbr->fetchObject( $result );
+ $row = $dbr->selectRow(
+ array( 'globaluser', 'localuser' ),
+ array(
+ 'gu_id', 'lu_wiki', 'gu_salt', 'gu_password',
'gu_auth_token',
+ 'gu_locked', 'gu_hidden', 'gu_registration',
'gu_email',
+ 'gu_email_authenticated', 'gu_home_db'
+ ),
+ array( 'gu_name' => $this->mName ),
+ __METHOD__,
+ array(),
+ array( 'localuser' => array( 'LEFT OUTER JOIN', array(
'gu_name=lu_name', 'lu_wiki' => wfWikiID() ) ) )
+ );
$this->loadFromRow( $row, true );
$this->saveToCache();
@@ -1401,14 +1404,14 @@
function doListUnattached() {
$dbw = self::getCentralDB();
- $sql = "
- SELECT ln_wiki
- FROM localnames
- LEFT OUTER JOIN localuser
- ON ln_wiki=lu_wiki AND ln_name=lu_name
- WHERE ln_name=? AND lu_name IS NULL
- ";
- $result = $dbw->safeQuery( $sql, $this->mName );
+ $result = $dbw->select(
+ array( 'localnames', 'localuser' ),
+ array( 'ln_wiki' ),
+ array( 'ln_name' => $this->mName, 'lu_name IS NULL' ),
+ __METHOD__,
+ array(),
+ array( 'localuser' => array( 'LEFT OUTER JOIN', array(
'ln_wiki=lu_wiki', 'ln_name=lu_name' ) ) )
+ );
$dbs = array();
foreach ( $result as $row ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
