* Defer load of groups data * Introduce newFromRow()/loadFromRow() to allow bulk loading of user objects from a result set * Hook email and email authentication save/load to allow CentralAuth to provide a global email address * Defer save of user data after confirmEmail() and invalidateEmail(). Caller must now also call saveSettings(). This reduces the master query count in some code paths. Elsewhere: * Introduce UserArray class, for bulk loading of user objects. Immediately useful in email notification, potentially useful for proposed user alias feature. * In Special:Confirmemail, remove useless handling for impossible false return from confirmEmail()/invalidateEmail().
62 lines
1.2 KiB
PHP
62 lines
1.2 KiB
PHP
<?php
|
|
|
|
abstract class UserArray implements Iterator {
|
|
static function newFromResult( $res ) {
|
|
$userArray = null;
|
|
if ( !wfRunHooks( 'UserArrayFromResult', array( &$userArray, $res ) ) ) {
|
|
return null;
|
|
}
|
|
if ( $userArray === null ) {
|
|
$userArray = self::newFromResult_internal( $res );
|
|
}
|
|
return $userArray;
|
|
}
|
|
|
|
protected static function newFromResult_internal( $res ) {
|
|
$userArray = new UserArrayFromResult( $res );
|
|
return $userArray;
|
|
}
|
|
}
|
|
|
|
class UserArrayFromResult extends UserArray {
|
|
var $res;
|
|
var $key, $current;
|
|
|
|
function __construct( $res ) {
|
|
$this->res = $res;
|
|
$this->key = 0;
|
|
$this->setCurrent( $this->res->current() );
|
|
}
|
|
|
|
protected function setCurrent( $row ) {
|
|
if ( $row === false ) {
|
|
$this->current = false;
|
|
} else {
|
|
$this->current = User::newFromRow( $row );
|
|
}
|
|
}
|
|
|
|
function current() {
|
|
return $this->current;
|
|
}
|
|
|
|
function key() {
|
|
return $this->key;
|
|
}
|
|
|
|
function next() {
|
|
$row = $this->res->next();
|
|
$this->setCurrent( $row );
|
|
$this->key++;
|
|
}
|
|
|
|
function rewind() {
|
|
$this->res->rewind();
|
|
$this->key = 0;
|
|
$this->setCurrent( $this->res->current() );
|
|
}
|
|
|
|
function valid() {
|
|
return $this->current !== false;
|
|
}
|
|
}
|