Documentation and explicit variable definitions

Followup r80069, swap private to protected
This commit is contained in:
Sam Reed 2011-03-07 14:45:11 +00:00
parent 98d43919bd
commit 0e38c2cdce
5 changed files with 34 additions and 10 deletions

View file

@ -25,7 +25,12 @@
*/
class HTMLCacheUpdate
{
public $mTitle, $mTable, $mPrefix, $mStart, $mEnd;
/**
* @var Title
*/
public $mTitle;
public $mTable, $mPrefix, $mStart, $mEnd;
public $mRowsPerJob, $mRowsPerQuery;
function __construct( $titleTo, $table, $start = false, $end = false ) {

View file

@ -20,7 +20,12 @@
* @ingroup Cache
*/
class HTMLFileCache {
var $mTitle, $mFileCache, $mType;
/**
* @var Title
*/
var $mTitle;
var $mFileCache, $mType;
public function __construct( &$title, $type = 'view' ) {
$this->mTitle = $title;

View file

@ -173,10 +173,20 @@ class User {
/**
* Lazy-initialized variables, invalidated with clearInstanceCache
*/
var $mNewtalk, $mDatePreference, $mBlockedby, $mHash, $mSkin, $mRights,
$mBlockreason, $mBlock, $mEffectiveGroups, $mBlockedGlobally,
var $mNewtalk, $mDatePreference, $mBlockedby, $mHash, $mRights,
$mBlockreason, $mEffectiveGroups, $mBlockedGlobally,
$mLocked, $mHideName, $mOptions;
/**
* @var Skin
*/
var $mSkin;
/**
* @var Block
*/
var $mBlock;
static $idCacheByName = array();
/**
@ -3774,8 +3784,4 @@ class User {
return $ret;
}
}

View file

@ -38,7 +38,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
*/
class ApiQueryAllimages extends ApiQueryGeneratorBase {
private $mRepo;
protected $mRepo;
public function __construct( $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'ai' );

View file

@ -47,10 +47,17 @@ class LoginForm extends SpecialPage {
var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
var $mLoginattempt, $mRemember, $mEmail, $mDomain, $mLanguage;
var $mSkipCookieCheck, $mReturnToQuery, $mToken, $mStickHTTPS;
var $mType, $mReason, $mRealName;
var $mAbortLoginErrorMsg = 'login-abort-generic';
/**
* @var ExternalUser
*/
private $mExtUser = null;
/**
* @param WebRequest $request
*/
public function __construct( $request = null ) {
parent::__construct( 'Userlogin' );
@ -261,7 +268,8 @@ class LoginForm extends SpecialPage {
// create a local account and login as any domain user). We only need
// to check this for domains that aren't local.
if( 'local' != $this->mDomain && $this->mDomain != '' ) {
if( !$wgAuth->canCreateAccounts() && ( !$wgAuth->userExists( $this->mUsername ) || !$wgAuth->authenticate( $this->mUsername, $this->mPassword ) ) ) {
if( !$wgAuth->canCreateAccounts() && ( !$wgAuth->userExists( $this->mUsername )
|| !$wgAuth->authenticate( $this->mUsername, $this->mPassword ) ) ) {
$this->mainLoginForm( wfMsg( 'wrongpassword' ) );
return false;
}