From: Antoine Musso Date: Thu, 11 May 2006 22:40:38 +0000 (+0000) Subject: Revert to r14165 . Did too many changes, didnt even run parserTests (i am bad) X-Git-Tag: 1.31.0-rc.0~57176 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=7ebdb6de899ca4a7673b48f4c98a477d5631db7e;p=lhc%2Fweb%2Fwiklou.git Revert to r14165 . Did too many changes, didnt even run parserTests (i am bad) --- diff --git a/includes/Article.php b/includes/Article.php index 4d479f1c41..945f5c5da0 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -26,32 +26,30 @@ class Article { /**@{{ * @private */ - private $mComment; //!< - private $mContent; //!< - private $mContentLoaded; //!< - private $mCounter; //!< - private $mFileCache; //!< - private $mForUpdate; //!< - private $mGoodAdjustment; //!< - private $mId; //!< - private $mLatest; //!< - private $mMinorEdit; //!< - private $mOldId; //!< - private $mRedirectedFrom; //!< - private $mRedirectUrl; //!< - private $mRevIdFetched; //!< - private $mRevision; //!< - private $mTable; //!< - private $mTimestamp; //!< - private $mTotalAdjustment; //!< - private $mUser; //!< - private $mUserText; //!< + var $mComment; //!< + var $mContent; //!< + var $mContentLoaded; //!< + var $mCounter; //!< + var $mFileCache; //!< + var $mForUpdate; //!< + var $mGoodAdjustment; //!< + var $mId; //!< + var $mLatest; //!< + var $mMinorEdit; //!< + var $mOldId; //!< + var $mRedirectedFrom; //!< + var $mRedirectUrl; //!< + var $mRevIdFetched; //!< + var $mRevision; //!< + var $mTable; //!< + var $mTimestamp; //!< + var $mTitle; //!< + var $mTotalAdjustment; //!< + var $mTouched; //!< + var $mUser; //!< + var $mUserText; //!< /**@}}*/ - public $mTitle; //!< - public $mTouched; //!< - - /** * Constructor and clear the article * @param $title Reference to a Title object. diff --git a/includes/Block.php b/includes/Block.php index 0a5f044374..42969b606c 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -24,24 +24,9 @@ define ( 'EB_RANGE_ONLY', 4 ); */ class Block { - public - $mAddress, - $mAuto, - $mBy, - $mExpiry, - $mId, - $mRangeEnd, - $mRangeStart, - $mReason, - $mTimestamp, - $mUser ; - - private - $mByName, - $mForUpdate, - $mFromMaster, - $mIntegerAddr, - $mNetworkBits ; + /* public*/ var $mAddress, $mUser, $mBy, $mReason, $mTimestamp, $mAuto, $mId, $mExpiry, + $mRangeStart, $mRangeEnd; + /* private */ var $mNetworkBits, $mIntegerAddr, $mForUpdate, $mFromMaster, $mByName; function Block( $address = '', $user = '', $by = 0, $reason = '', $timestamp = '' , $auto = 0, $expiry = '' ) diff --git a/includes/CacheManager.php b/includes/CacheManager.php index 98a16ae5f7..0d116f72ad 100644 --- a/includes/CacheManager.php +++ b/includes/CacheManager.php @@ -24,9 +24,7 @@ require_once( 'Title.php' ); * @package MediaWiki */ class CacheManager { - private - $mTitle, - $mFileCache; + var $mTitle, $mFileCache; function CacheManager( &$title ) { $this->mTitle =& $title; diff --git a/includes/ChangesList.php b/includes/ChangesList.php index f8c8585403..59c410fe98 100644 --- a/includes/ChangesList.php +++ b/includes/ChangesList.php @@ -14,19 +14,12 @@ require_once("RecentChange.php"); */ class RCCacheEntry extends RecentChange { - private - $curlink, - $difflink, - $lastlink, - $link, - $secureName, - $timestamp, - $userlink, - $usertalklink, - $versionlink, - $watched ; - - function newFromParent( $rc ) { + var $secureName, $link; + var $curlink , $difflink, $lastlink , $usertalklink , $versionlink ; + var $userlink, $timestamp, $watched; + + function newFromParent( $rc ) + { $rc2 = new RCCacheEntry; $rc2->mAttribs = $rc->mAttribs; $rc2->mExtra = $rc->mExtra; diff --git a/includes/Database.php b/includes/Database.php index 4ec968690c..8376f06fd3 100644 --- a/includes/Database.php +++ b/includes/Database.php @@ -25,7 +25,7 @@ define( 'DEADLOCK_DELAY_MIN', 500000 ); define( 'DEADLOCK_DELAY_MAX', 1500000 ); class DBObject { - private $mData; + var $mData; function DBObject($data) { $this->mData = $data; @@ -52,17 +52,17 @@ class Database { /**#@+ * @private */ - private $mLastQuery = ''; + var $mLastQuery = ''; - private $mServer, $mUser, $mPassword, $mConn = null, $mDBname; - private $mOut, $mOpened = false; + var $mServer, $mUser, $mPassword, $mConn = null, $mDBname; + var $mOut, $mOpened = false; - private $mFailFunction; - private $mTablePrefix; - private $mFlags; - private $mTrxLevel = 0; - private $mErrorCount = 0; - private $mLBInfo = array(); + var $mFailFunction; + var $mTablePrefix; + var $mFlags; + var $mTrxLevel = 0; + var $mErrorCount = 0; + var $mLBInfo = array(); /**#@-*/ #------------------------------------------------------------------------------ @@ -1795,7 +1795,7 @@ class DatabaseMysql extends Database { * @package MediaWiki */ class ResultWrapper { - private $db, $result; + var $db, $result; /** * @todo document diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php index 3a5839218b..15f5878181 100644 --- a/includes/DifferenceEngine.php +++ b/includes/DifferenceEngine.php @@ -21,24 +21,14 @@ class DifferenceEngine { /**#@+ * @private */ - private - $mNewid, - $mNewPage, - $mNewRev, - $mNewtext, - $mNewtitle, - - $mOldid, - $mOldPage, - $mOldRev, - $mOldtext, - $mOldtitle, - - $mPagetitle, - $mRcidMarkPatrolled, - $mRevisionsLoaded = false, // Have the revisions been loaded - $mTextLoaded = 0, // How many text blobs have been loaded, 0, 1 or 2? - $mTitle; + var $mOldid, $mNewid, $mTitle; + var $mOldtitle, $mNewtitle, $mPagetitle; + var $mOldtext, $mNewtext; + var $mOldPage, $mNewPage; + var $mRcidMarkPatrolled; + var $mOldRev, $mNewRev; + var $mRevisionsLoaded = false; // Have the revisions been loaded + var $mTextLoaded = 0; // How many text blobs have been loaded, 0, 1 or 2? /**#@-*/ /** @@ -603,10 +593,9 @@ define('USE_ASSERTS', function_exists('assert')); * @subpackage DifferenceEngine */ class _DiffOp { - private - $closing, - $orig, - $type; + var $type; + var $orig; + var $closing; function reverse() { trigger_error('pure virtual', E_USER_ERROR); @@ -628,8 +617,7 @@ class _DiffOp { * @subpackage DifferenceEngine */ class _DiffOp_Copy extends _DiffOp { - public - $type = 'copy'; + var $type = 'copy'; function _DiffOp_Copy ($orig, $closing = false) { if (!is_array($closing)) @@ -650,7 +638,7 @@ class _DiffOp_Copy extends _DiffOp { * @subpackage DifferenceEngine */ class _DiffOp_Delete extends _DiffOp { - public $type = 'delete'; + var $type = 'delete'; function _DiffOp_Delete ($lines) { $this->orig = $lines; @@ -669,7 +657,7 @@ class _DiffOp_Delete extends _DiffOp { * @subpackage DifferenceEngine */ class _DiffOp_Add extends _DiffOp { - public $type = 'add'; + var $type = 'add'; function _DiffOp_Add ($lines) { $this->closing = $lines; @@ -688,8 +676,7 @@ class _DiffOp_Add extends _DiffOp { * @subpackage DifferenceEngine */ class _DiffOp_Change extends _DiffOp { - private - $type = 'change'; + var $type = 'change'; function _DiffOp_Change ($orig, $closing) { $this->orig = $orig; @@ -1148,7 +1135,7 @@ class _DiffEngine */ class Diff { - public $edits; + var $edits; /** * Constructor. @@ -1360,7 +1347,7 @@ class DiffFormatter * This should be left at zero for this class, but subclasses * may want to set this to other values. */ - public $leading_context_lines = 0; + var $leading_context_lines = 0; /** * Number of trailing context "lines" to preserve. @@ -1368,7 +1355,7 @@ class DiffFormatter * This should be left at zero for this class, but subclasses * may want to set this to other values. */ - public $trailing_context_lines = 0; + var $trailing_context_lines = 0; /** * Format a diff. diff --git a/includes/EditPage.php b/includes/EditPage.php index bc295ffdcc..abb5e16f8d 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -14,42 +14,30 @@ */ class EditPage { - private - $allowBlankSummary = false, - $autoSumm = '', - $deletedSinceEdit = false, - $firsttime, - $formtype, - $hookError = '', - $isConflict = false, - $isCssJsSubpage = false, - $kblength = false, - $lastDelete, - $mArticle, - $missingComment = false, - $missingSummary = false, - $mMetaData = '', - $mTitle, - $mTokenOk = true, - $tooBig = false ; + var $mArticle; + var $mTitle; + var $mMetaData = ''; + var $isConflict = false; + var $isCssJsSubpage = false; + var $deletedSinceEdit = false; + var $formtype; + var $firsttime; + var $lastDelete; + var $mTokenOk = true; + var $tooBig = false; + var $kblength = false; + var $missingComment = false; + var $missingSummary = false; + var $allowBlankSummary = false; + var $autoSumm = ''; + var $hookError = ''; # Form values - private - $diff = false, - $editintro = '', - $edittime = '', - $minoredit = false, - $oldid = 0, - $preview = false, - $recreate = false, - $save = false, - $scrolltop = null, - $section = '', - $starttime = '', - $summary = '', - $textbox1 = '', - $textbox2 = '', - $watchthis = false ; + var $save = false, $preview = false, $diff = false; + var $minoredit = false, $watchthis = false, $recreate = false; + var $textbox1 = '', $textbox2 = '', $summary = ''; + var $edittime = '', $section = '', $starttime = ''; + var $oldid = 0, $editintro = '', $scrolltop = null; /** * @todo document @@ -400,7 +388,7 @@ class EditPage { $this->watchthis = $request->getCheck( 'wpWatchthis' ); # Don't force edit summaries when a user is editing their own user or talk page - if( ( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) && $this->mTitle->getText() == $wgUser->getName() ) { + if( ( $this->mTitle->mNamespace == NS_USER || $this->mTitle->mNamespace == NS_USER_TALK ) && $this->mTitle->getText() == $wgUser->getName() ) { $this->allowBlankSummary = true; } else { $this->allowBlankSummary = $request->getBool( 'wpIgnoreBlankSummary' ); diff --git a/includes/Exif.php b/includes/Exif.php index d51a5f2ca9..100968824d 100644 --- a/includes/Exif.php +++ b/includes/Exif.php @@ -55,29 +55,29 @@ class Exif { * is the value, in the case of more than one possible value type they are * seperated by commas. */ - private $mExifTags; + var $mExifTags; /** * A one dimentional array of all Exif tags */ - private $mFlatExifTags; + var $mFlatExifTags; /** * The raw Exif data returned by exif_read_data() */ - private $mRawExifData; + var $mRawExifData; /** * A Filtered version of $mRawExifData that has been pruned of invalid * tags and tags that contain content they shouldn't contain according * to the Exif specification */ - private $mFilteredExifData; + var $mFilteredExifData; /** * Filtered and formatted Exif data, see FormatExif::getFormattedData() */ - private $mFormattedExifData; + var $mFormattedExifData; //@} @@ -89,17 +89,17 @@ class Exif { /** * The file being processed */ - private $file; + var $file; /** * The basename of the file being processed */ - private $basename; + var $basename; /** * The private log to log to */ - private $log = 'exif'; + var $log = 'exif'; //@} @@ -605,7 +605,7 @@ class FormatExif { * @var array * @private */ - private $mExif; + var $mExif; /** * Constructor diff --git a/includes/Feed.php b/includes/Feed.php index fb32445fc1..7663e8208f 100644 --- a/includes/Feed.php +++ b/includes/Feed.php @@ -35,12 +35,11 @@ class FeedItem { * @var string * @private */ - private - $Author = '', - $Date = '', - $Description = '', - $Title = 'Wiki', - $Url = '' ; + var $Title = 'Wiki'; + var $Description = ''; + var $Url = ''; + var $Date = ''; + var $Author = ''; /**#@-*/ /**#@+ diff --git a/includes/HistoryBlob.php b/includes/HistoryBlob.php index daa444caa3..4dee4da5d1 100644 --- a/includes/HistoryBlob.php +++ b/includes/HistoryBlob.php @@ -52,14 +52,10 @@ class HistoryBlob * The real object * @package MediaWiki */ -class ConcatenatedGzipHistoryBlob extends HistoryBlob { - private - $mCompressed = false, - $mDefaultHash = '', - $mFast = 0, - $mItems = array(), - $mSize = 0, - $mVersion = 0 ; +class ConcatenatedGzipHistoryBlob extends HistoryBlob +{ + /* private */ var $mVersion = 0, $mCompressed = false, $mItems = array(), $mDefaultHash = ''; + /* private */ var $mFast = 0, $mSize = 0; function ConcatenatedGzipHistoryBlob() { if ( !function_exists( 'gzdeflate' ) ) { @@ -186,10 +182,7 @@ $wgBlobCache = array(); * @package MediaWiki */ class HistoryBlobStub { - private - $mHash, - $mOldId, - $mRef; + var $mOldId, $mHash, $mRef; /** @todo document */ function HistoryBlobStub( $hash = '', $oldid = 0 ) { @@ -285,8 +278,7 @@ class HistoryBlobStub { * @package MediaWiki */ class HistoryBlobCurStub { - private - $mCurId; + var $mCurId; /** @todo document */ function HistoryBlobCurStub( $curid = 0 ) { diff --git a/includes/Image.php b/includes/Image.php index 2fcce3b009..4547a8c480 100644 --- a/includes/Image.php +++ b/includes/Image.php @@ -32,8 +32,7 @@ class Image /**#@+ * @private */ - private - $name, # name of the image (constructor) + var $name, # name of the image (constructor) $imagePath, # Path of the image (loadFromXxx) $url, # Image URL (accessor) $title, # Title object for this image (constructor) @@ -52,6 +51,7 @@ class Image $dataLoaded, # Whether or not all this has been loaded from the database (loadFromXxx) $lastError; # Error string associated with a thumbnail display error + /**#@-*/ /** diff --git a/includes/JobQueue.php b/includes/JobQueue.php index ebb5d74043..d589d8c019 100644 --- a/includes/JobQueue.php +++ b/includes/JobQueue.php @@ -5,8 +5,7 @@ if ( !defined( 'MEDIAWIKI' ) ) { } class Job { - private - $command, + var $command, $title, $params, $id, diff --git a/includes/LinkBatch.php b/includes/LinkBatch.php index e385edea4e..e0f0f6fd10 100644 --- a/includes/LinkBatch.php +++ b/includes/LinkBatch.php @@ -10,9 +10,8 @@ class LinkBatch { /** * 2-d array, first index namespace, second index dbkey, value arbitrary - * @todo FIXME should it really be public ? */ - public $data = array(); + var $data = array(); function LinkBatch( $arr = array() ) { foreach( $arr as $item ) { diff --git a/includes/LinkCache.php b/includes/LinkCache.php index 355f1575d2..451b3f0c0a 100644 --- a/includes/LinkCache.php +++ b/includes/LinkCache.php @@ -12,12 +12,11 @@ class LinkCache { // Increment $mClassVer whenever old serialized versions of this class // becomes incompatible with the new version. - private - $mBadLinks, - $mClassVer = 3, - $mForUpdate, - $mGoodLinks, - $mPageLinks ; + /* private */ var $mClassVer = 3; + + /* private */ var $mPageLinks; + /* private */ var $mGoodLinks, $mBadLinks; + /* private */ var $mForUpdate; /** * Get an instance of this class diff --git a/includes/LinksUpdate.php b/includes/LinksUpdate.php index 9375de622d..bd09502e79 100644 --- a/includes/LinksUpdate.php +++ b/includes/LinksUpdate.php @@ -13,8 +13,7 @@ class LinksUpdate { /**@{{ * @private */ - private - $mId, //!< Page ID of the article linked from + var $mId, //!< Page ID of the article linked from $mTitle, //!< Title object of the article linked from $mLinks, //!< Map of title strings to IDs for the links in the document $mImages, //!< DB keys of the images used, in the array key only diff --git a/includes/LoadBalancer.php b/includes/LoadBalancer.php index 7206b7ba33..465f3b9985 100644 --- a/includes/LoadBalancer.php +++ b/includes/LoadBalancer.php @@ -32,23 +32,11 @@ define( 'AVG_STATUS_POLL', 2000 ); * @package MediaWiki */ class LoadBalancer { - - private - $mAllowLagged, - $mConnections, - $mErrorConnection, - $mFailFunction, - $mForce, - $mGroupLoads, - $mLaggedSlaveMode, - $mLastError = 'Unknown error', - $mLastIndex, - $mLoads, - $mReadIndex, - $mServers, - $mWaitForFile, - $mWaitForPos, - $mWaitTimeout ; + /* private */ var $mServers, $mConnections, $mLoads, $mGroupLoads; + /* private */ var $mFailFunction, $mErrorConnection; + /* private */ var $mForce, $mReadIndex, $mLastIndex, $mAllowLagged; + /* private */ var $mWaitForFile, $mWaitForPos, $mWaitTimeout; + /* private */ var $mLaggedSlaveMode, $mLastError = 'Unknown error'; function LoadBalancer() { @@ -62,7 +50,7 @@ class LoadBalancer { $this->mAllowLag = false; } - static function newFromParams( $servers, $failFunction = false, $waitTimeout = 10 ) + function newFromParams( $servers, $failFunction = false, $waitTimeout = 10 ) { $lb = new LoadBalancer; $lb->initialise( $servers, $failFunction, $waitTimeout ); diff --git a/includes/LogPage.php b/includes/LogPage.php index f9181a7672..5741e0cee7 100644 --- a/includes/LogPage.php +++ b/includes/LogPage.php @@ -33,9 +33,9 @@ */ class LogPage { /* @access private */ - private $type, $action, $comment, $params, $target; + var $type, $action, $comment, $params, $target; /* @acess public */ - public $updateRecentChanges; + var $updateRecentChanges; /** * Constructor @@ -93,25 +93,23 @@ class LogPage { /** * @static */ - static function validTypes() { + function validTypes() { static $types = array( '', 'block', 'protect', 'rights', 'delete', 'upload', 'move' ); wfRunHooks( 'LogPageValidTypes', array( &$types ) ); return $types; } /** - * @param $type * @static */ - static function isLogType( $type ) { + function isLogType( $type ) { return in_array( $type, LogPage::validTypes() ); } /** - * @param $type * @static */ - static function logName( $type ) { + function logName( $type ) { static $typeText = array( '' => 'log', 'block' => 'blocklogpage', @@ -134,7 +132,7 @@ class LogPage { /** * @static */ - static function logHeader( $type ) { + function logHeader( $type ) { static $headerText = array( '' => 'alllogstext', 'block' => 'blocklogtext', @@ -150,16 +148,9 @@ class LogPage { } /** - * @param $type - * @param $action - * @param $title (Default: NULL) - * @param $skin (Default: NULL) - * @param $params (Default: array() ) - * @param $filterWikilinks (Default: false) - * @param $translate (Default: false) * @static */ - static function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false, $translate=false ) { + function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false, $translate=false ) { global $wgLang, $wgContLang; static $actions = array( 'block/block' => 'blocklogentry', @@ -265,10 +256,9 @@ class LogPage { /** * Create a blob from a parameter array - * @param $params Need documentation. * @static */ - static function makeParamBlob( $params ) { + function makeParamBlob( $params ) { return implode( "\n", $params ); } @@ -276,7 +266,7 @@ class LogPage { * Extract a parameter array from a blob * @static */ - static function extractParams( $blob ) { + function extractParams( $blob ) { if ( $blob === '' ) { return array(); } else { diff --git a/includes/MagicWord.php b/includes/MagicWord.php index cd654ce5a2..1dfadfea22 100644 --- a/includes/MagicWord.php +++ b/includes/MagicWord.php @@ -152,21 +152,11 @@ class MagicWord { /**#@+ * @access private */ - private - $mBaseRegex, - $mModified, - $mRegex, - $mRegexStart, - $mVariableRegex ; + var $mId, $mSynonyms, $mCaseSensitive, $mRegex; + var $mRegexStart, $mBaseRegex, $mVariableRegex; + var $mModified; /**#@-*/ - /** @todo FIXME should they really be public ? */ - public - $mCaseSensitive, - $mId, - $mSynonyms ; - - function MagicWord($id = 0, $syn = '', $cs = false) { $this->mId = $id; $this->mSynonyms = (array)$syn; @@ -182,7 +172,7 @@ class MagicWord { * Factory: creates an object representing an ID * @static */ - static function &get( $id ) { + function &get( $id ) { global $wgMagicWords; if ( !is_array( $wgMagicWords ) ) { diff --git a/includes/MessageCache.php b/includes/MessageCache.php index df66cddd4f..ea7ae52e09 100644 --- a/includes/MessageCache.php +++ b/includes/MessageCache.php @@ -22,18 +22,11 @@ define( 'MSG_WAIT_TIMEOUT', 10); * @package MediaWiki */ class MessageCache { - private - $mCache, - $mDeferred = true, - $mDisable, - $mExpiry, - $mExtensionMessages = array(), - $mInitialised = false, - $mKeys, - $mMemcKey, - $mParser, - $mParserOptions, - $mUseCache ; + var $mCache, $mUseCache, $mDisable, $mExpiry; + var $mMemcKey, $mKeys, $mParserOptions, $mParser; + var $mExtensionMessages = array(); + var $mInitialised = false; + var $mDeferred = true; function initialise( &$memCached, $useDB, $expiry, $memcPrefix) { $fname = 'MessageCache::initialise'; diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 71aa0b8bbe..4b3710d522 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -13,30 +13,24 @@ if ( $wgUseTeX ) * @package MediaWiki */ class OutputPage { - private $mHeaders, $mMetatags, $mKeywords; - private $mLinktags, $mPagetitle; - private $mHTMLtitle, $mRobotpolicy, $mIsarticle, $mPrintable; - private $mSubtitle, $mRedirect, $mStatusCode; - private $mLastModified, $mETag ; - private $mScripts, $mLinkColours; - private $mSuppressQuickbar; - private $mOnloadHandler; - private $mDoNothing; - private $mContainsOldMagic, $mContainsNewMagic; - private $mIsArticleRelated; - private $mShowFeedLinks = false; - private $mEnableClientCache = true; - private $mArticleBodyOnly = false; - private $mNewSectionLink = false; - - /** @todo FIXME shouldn't those be private ? */ - public - $mPageLinkTitle, - $mCategoryLinks, - $mDebugtext, - $mBodytext, - $mParserOptions // Called in SkinTemplate when using Special::UserLogin - ; + var $mHeaders, $mMetatags, $mKeywords; + var $mLinktags, $mPagetitle, $mBodytext, $mDebugtext; + var $mHTMLtitle, $mRobotpolicy, $mIsarticle, $mPrintable; + var $mSubtitle, $mRedirect, $mStatusCode; + var $mLastModified, $mETag, $mCategoryLinks; + var $mScripts, $mLinkColours, $mPageLinkTitle; + + var $mSuppressQuickbar; + var $mOnloadHandler; + var $mDoNothing; + var $mContainsOldMagic, $mContainsNewMagic; + var $mIsArticleRelated; + var $mParserOptions; + var $mShowFeedLinks = false; + var $mEnableClientCache = true; + var $mArticleBodyOnly = false; + + var $mNewSectionLink = false; /** * Constructor @@ -611,7 +605,7 @@ class OutputPage { print $outs; } - static function setEncodings() { + function setEncodings() { global $wgInputEncoding, $wgOutputEncoding; global $wgUser, $wgContLang; diff --git a/includes/PageHistory.php b/includes/PageHistory.php index 312056dc36..4cfee47a89 100644 --- a/includes/PageHistory.php +++ b/includes/PageHistory.php @@ -21,14 +21,11 @@ define('DIR_NEXT', 1); */ class PageHistory { - private - $lastdate, - $linesonpage, - $mArticle, - $mLatestId = null, - $mNotificationTimestamp, - $mSkin, - $mTitle ; + var $mArticle, $mTitle, $mSkin; + var $lastdate; + var $linesonpage; + var $mNotificationTimestamp; + var $mLatestId = null; /** * Construct a new PageHistory. diff --git a/includes/Parser.php b/includes/Parser.php index 62e1e96f63..8976971ae9 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -93,33 +93,20 @@ class Parser * @private */ # Persistent: - private $mTagHooks, $mFunctionHooks; + var $mTagHooks, $mFunctionHooks; # Cleared with clearState(): - private - $mArgStack, - $mAutonumber, - $mDTopen, - $mIncludeCount, - $mInPre, - $mInterwikiLinkHolders, - $mLastSection, - $mLinkHolders, - $mOutput, - $mStripState = array(), - $mUniqPrefix, - $mVariables ; - - private - $mTemplates, // cache of already loaded templates, avoids + var $mOutput, $mAutonumber, $mDTopen, $mStripState = array(); + var $mVariables, $mIncludeCount, $mArgStack, $mLastSection, $mInPre; + var $mInterwikiLinkHolders, $mLinkHolders, $mUniqPrefix; + var $mTemplates, // cache of already loaded templates, avoids // multiple SQL queries for the same string $mTemplatePath; // stores an unsorted hash of all the templates already loaded // in this path. Used for loop detection. # Temporary # These are variables reset at least once per parse regardless of $clearState - private - $mOptions, // ParserOptions object + var $mOptions, // ParserOptions object $mTitle, // Title context, used for self-link rendering and similar things $mOutputType, // Output type, one of the OT_xxx constants $mRevisionId; // ID to display in {{REVISIONID}} tags @@ -4090,25 +4077,20 @@ class Parser */ class ParserOutput { - private - $mCacheTime, # Time when this object was generated, or -1 for uncacheable. Used in ParserCache. - $mCategories, # Map of category names to sort keys - $mExternalLinks, # External link URLs, in the key only - $mImages, # DB keys of the images used, in the array key only + var $mText, # The output text $mLanguageLinks, # List of the full text of language links, in the order they appear + $mCategories, # Map of category names to sort keys + $mContainsOldMagic, # Boolean variable indicating if the input contained variables like {{CURRENTDAY}} + $mCacheTime, # Time when this object was generated, or -1 for uncacheable. Used in ParserCache. + $mVersion, # Compatibility check + $mTitleText, # title text of the chosen language variant $mLinks, # 2-D map of NS/DBK to ID for the links in the document. ID=zero for broken. - $mNewSection, # Show a new section link? - $mSubtitle, # Additional subtitle $mTemplates, # 2-D map of NS/DBK to ID for the template references. ID=zero for broken. - $mTitleText, # title text of the chosen language variant - $mVersion ; # Compatibility check - - - /** @todo FIXME should those be public ? */ - public - $mContainsOldMagic, # Boolean variable indicating if the input contained variables like {{CURRENTDAY}} + $mImages, # DB keys of the images used, in the array key only + $mExternalLinks, # External link URLs, in the key only $mHTMLtitle, # Display HTML title - $mText ; # The output text // public cause its used in ParserCache::save + $mSubtitle, # Additional subtitle + $mNewSection; # Show a new section link? function ParserOutput( $text = '', $languageLinks = array(), $categoryLinks = array(), $containsOldMagic = false, $titletext = '' ) @@ -4205,19 +4187,18 @@ class ParserOutput class ParserOptions { # All variables are private - private - $mAllowExternalImages, # Allow external images inline - $mAllowExternalImagesFrom, # If not, any exception? - $mAllowSpecialInclusion, # Allow inclusion of special pages - $mDateFormat, # Date format index - $mEditSection, # Create "edit section" links - $mInterfaceMessage, # Which lang to call for PLURAL and GRAMMAR - $mInterwikiMagic, # Interlanguage links are removed and returned in an array - $mNumberHeadings, # Automatically number headings - $mSkin, # Reference to the preferred skin - $mTidy, # Ask for tidy cleanup - $mUseDynamicDates, # Use DateFormatter to format dates - $mUseTeX ; # Use texvc to expand tags + var $mUseTeX; # Use texvc to expand tags + var $mUseDynamicDates; # Use DateFormatter to format dates + var $mInterwikiMagic; # Interlanguage links are removed and returned in an array + var $mAllowExternalImages; # Allow external images inline + var $mAllowExternalImagesFrom; # If not, any exception? + var $mSkin; # Reference to the preferred skin + var $mDateFormat; # Date format index + var $mEditSection; # Create "edit section" links + var $mNumberHeadings; # Automatically number headings + var $mAllowSpecialInclusion; # Allow inclusion of special pages + var $mTidy; # Ask for tidy cleanup + var $mInterfaceMessage; # Which lang to call for PLURAL and GRAMMAR function getUseTeX() { return $this->mUseTeX; } function getUseDynamicDates() { return $this->mUseDynamicDates; } @@ -4254,7 +4235,7 @@ class ParserOptions * Get parser options * @static */ - static function newFromUser( &$user ) { + function newFromUser( &$user ) { $popts = new ParserOptions; $popts->initialiseFromUser( $user ); return $popts; diff --git a/includes/ParserCache.php b/includes/ParserCache.php index 32514adff8..712c664cdf 100644 --- a/includes/ParserCache.php +++ b/includes/ParserCache.php @@ -102,8 +102,7 @@ class ParserCache { // Save the timestamp so that we don't have to load the revision row on view $parserOutput->mTimestamp = $article->getTimestamp(); - - # FIXME : attempt to access private parserOutput::mText ? + $parserOutput->mText .= "\n\n"; wfDebug( "Saved in parser cache with key $key and timestamp $now\n" ); diff --git a/includes/QueryPage.php b/includes/QueryPage.php index 8377d99c50..7848c53cbc 100644 --- a/includes/QueryPage.php +++ b/includes/QueryPage.php @@ -56,21 +56,21 @@ if ( !$wgDisableCounters ) * * @package MediaWiki */ -abstract class QueryPage { +class QueryPage { /** * Whether or not we want plain listoutput rather than an ordered list * * @var bool */ - private $listoutput = false; + var $listoutput = false; /** * The offset and limit in use, as passed to the query() function * * @var integer */ - protected $offset = 0; - protected $limit = 0; + var $offset = 0; + var $limit = 0; /** * A mutator for $this->listoutput; diff --git a/includes/RecentChange.php b/includes/RecentChange.php index 26d72abdbb..659e688455 100644 --- a/includes/RecentChange.php +++ b/includes/RecentChange.php @@ -39,29 +39,23 @@ * @todo document functions and variables * @package MediaWiki */ -class RecentChange { - - private - $mExtra = array(), - $mMovedToTitle = false, - $mTitle = false; - - /** @todo FIXME should those really be public ? */ - public - $mAttribs = array(); - - public - $numberofWatchingusers = 0 ; # Dummy to prevent error message in SpecialRecentchangeslinked +class RecentChange +{ + var $mAttribs = array(), $mExtra = array(); + var $mTitle = false, $mMovedToTitle = false; + var $numberofWatchingusers = 0 ; # Dummy to prevent error message in SpecialRecentchangeslinked # Factory methods - static function newFromRow( $row ) { + /* static */ function newFromRow( $row ) + { $rc = new RecentChange; $rc->loadFromRow( $row ); return $rc; } - static function newFromCurRow( $row, $rc_this_oldid = 0 ) { + /* static */ function newFromCurRow( $row, $rc_this_oldid = 0 ) + { $rc = new RecentChange; $rc->loadFromCurRow( $row, $rc_this_oldid ); $rc->notificationtimestamp = false; @@ -202,7 +196,7 @@ class RecentChange { } # Makes an entry in the database corresponding to an edit - static function notifyEdit( $timestamp, &$title, $minor, &$user, $comment, + /*static*/ function notifyEdit( $timestamp, &$title, $minor, &$user, $comment, $oldId, $lastTimestamp, $bot = "default", $ip = '', $oldSize = 0, $newSize = 0, $newId = 0) { @@ -251,7 +245,7 @@ class RecentChange { # Makes an entry in the database corresponding to page creation # Note: the title object must be loaded with the new id using resetArticleID() - static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot = "default", + /*static*/ function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot = "default", $ip='', $size = 0, $newId = 0 ) { if ( !$ip ) { @@ -297,7 +291,7 @@ class RecentChange { } # Makes an entry in the database corresponding to a rename - static function notifyMove( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='', $overRedir = false ) + /*static*/ function notifyMove( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='', $overRedir = false ) { if ( !$ip ) { $ip = wfGetIP(); @@ -336,17 +330,17 @@ class RecentChange { $rc->save(); } - static function notifyMoveToNew( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='' ) { + /* static */ function notifyMoveToNew( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='' ) { RecentChange::notifyMove( $timestamp, $oldTitle, $newTitle, $user, $comment, $ip, false ); } - static function notifyMoveOverRedirect( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='' ) { + /* static */ function notifyMoveOverRedirect( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='' ) { RecentChange::notifyMove( $timestamp, $oldTitle, $newTitle, $user, $comment, $ip, true ); } # A log entry is different to an edit in that previous revisions are # not kept - static function notifyLog( $timestamp, &$title, &$user, $comment, $ip='', + /*static*/ function notifyLog( $timestamp, &$title, &$user, $comment, $ip='', $type, $action, $target, $logComment, $params ) { if ( !$ip ) { diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php index c91c741b17..784541940c 100644 --- a/includes/Sanitizer.php +++ b/includes/Sanitizer.php @@ -634,7 +634,7 @@ class Sanitizer { * @param string $id * @return string */ - static function escapeId( $id ) { + function escapeId( $id ) { static $replace = array( '%3A' => ':', '%' => '.' @@ -651,7 +651,7 @@ class Sanitizer { * @return string * @private */ - private static function armorLinksCallback( $matches ) { + function armorLinksCallback( $matches ) { return str_replace( ':', ':', $matches[1] ); } @@ -750,7 +750,6 @@ class Sanitizer { * @param string $text * @return string * @private - * @todo FIXME called from parser.php so not that much private */ function normalizeCharReferences( $text ) { return preg_replace_callback( @@ -762,7 +761,7 @@ class Sanitizer { * @param string $matches * @return string */ - static function normalizeCharReferencesCallback( $matches ) { + function normalizeCharReferencesCallback( $matches ) { $ret = null; if( $matches[1] != '' ) { $ret = Sanitizer::normalizeEntity( $matches[1] ); @@ -788,7 +787,7 @@ class Sanitizer { * @param string $name * @return string */ - static function normalizeEntity( $name ) { + function normalizeEntity( $name ) { global $wgHtmlEntities; if( isset( $wgHtmlEntities[$name] ) ) { return "&$name;"; @@ -836,9 +835,8 @@ class Sanitizer { * @param string $text * @return string * @public - * @static */ - public static function decodeCharReferences( $text ) { + function decodeCharReferences( $text ) { return preg_replace_callback( MW_CHAR_REFS_REGEX, array( 'Sanitizer', 'decodeCharReferencesCallback' ), @@ -849,7 +847,7 @@ class Sanitizer { * @param string $matches * @return string */ - static function decodeCharReferencesCallback( $matches ) { + function decodeCharReferencesCallback( $matches ) { if( $matches[1] != '' ) { return Sanitizer::decodeEntity( $matches[1] ); } elseif( $matches[2] != '' ) { @@ -1086,7 +1084,7 @@ class Sanitizer { * @return string * @static */ - static function hackDocType() { + function hackDocType() { global $wgHtmlEntities; $out = " $codepoint ) { diff --git a/includes/SearchUpdate.php b/includes/SearchUpdate.php index 135d9f04bd..1f222b3952 100644 --- a/includes/SearchUpdate.php +++ b/includes/SearchUpdate.php @@ -10,12 +10,8 @@ */ class SearchUpdate { - private - $mId = 0, - $mNamespace, - $mTitle, - $mText, - $mTitleWords; + /* private */ var $mId = 0, $mNamespace, $mTitle, $mText; + /* private */ var $mTitleWords; function SearchUpdate( $id, $title, $text = false ) { $nt = Title::newFromText( $title ); diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php index 293de95295..8fd5d6b6bd 100644 --- a/includes/SiteConfiguration.php +++ b/includes/SiteConfiguration.php @@ -15,10 +15,10 @@ define('SITE_CONFIGURATION', 1); /** @package MediaWiki */ class SiteConfiguration { - private $suffixes = array(); - private $wikis = array(); - private $settings = array(); - private $localVHosts = array(); + var $suffixes = array(); + var $wikis = array(); + var $settings = array(); + var $localVHosts = array(); /** */ function get( $setting, $wiki, $suffix, $params = array() ) { diff --git a/includes/SiteStatsUpdate.php b/includes/SiteStatsUpdate.php index 112ab2cdf9..1b6d3804e3 100644 --- a/includes/SiteStatsUpdate.php +++ b/includes/SiteStatsUpdate.php @@ -11,7 +11,7 @@ */ class SiteStatsUpdate { - private $mViews, $mEdits, $mGood, $mPages, $mUsers; + var $mViews, $mEdits, $mGood, $mPages, $mUsers; function SiteStatsUpdate( $views, $edits, $good, $pages = 0, $users = 0 ) { $this->mViews = $views; diff --git a/includes/Skin.php b/includes/Skin.php index eeffd3eed3..d1be56eb47 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -39,12 +39,10 @@ class Skin extends Linker { /**#@+ * @private */ - private - $lastdate, - $lastline, - $rc_cache, # Cache for Enhanced Recent Changes - $rcCacheIndex, # Recent Changes Cache Counter for visibility toggle - $rcMoveIndex; + var $lastdate, $lastline; + var $rc_cache ; # Cache for Enhanced Recent Changes + var $rcCacheIndex ; # Recent Changes Cache Counter for visibility toggle + var $rcMoveIndex; /**#@-*/ /** Constructor, call parent constructor */ diff --git a/includes/SpecialAllpages.php b/includes/SpecialAllpages.php index 1142e68365..8ea51ba912 100644 --- a/includes/SpecialAllpages.php +++ b/includes/SpecialAllpages.php @@ -38,12 +38,11 @@ function wfSpecialAllpages( $par=NULL, $specialPage ) { } class SpecialAllpages { - private - $maxPerPage = 960, - $name = 'Allpages', - # Determines, which message describes the input field 'nsfrom' (->SpecialPrefixindex.php) - $nsfromMsg = 'allpagesfrom', - $topLevelMax = 50; + var $maxPerPage=960; + var $topLevelMax=50; + var $name='Allpages'; + # Determines, which message describes the input field 'nsfrom' (->SpecialPrefixindex.php) + var $nsfromMsg='allpagesfrom'; /** * HTML for the top form diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php index 3e7f7f7823..b3f67ab10d 100644 --- a/includes/SpecialBlockip.php +++ b/includes/SpecialBlockip.php @@ -37,10 +37,7 @@ function wfSpecialBlockip( $par ) { * @subpackage SpecialPage */ class IPBlockForm { - private - $BlockAddress, - $BlockExpiry, - $BlockReason; + var $BlockAddress, $BlockExpiry, $BlockReason; function IPBlockForm( $par ) { global $wgRequest; diff --git a/includes/SpecialBooksources.php b/includes/SpecialBooksources.php index a4a899f261..960f622469 100644 --- a/includes/SpecialBooksources.php +++ b/includes/SpecialBooksources.php @@ -29,7 +29,7 @@ function wfSpecialBooksources( $par ) { * @subpackage SpecialPage */ class BookSourceList { - private $mIsbn; + var $mIsbn; function BookSourceList( $isbn ) { $this->mIsbn = $isbn; diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php index 10633c1cea..5354ccad36 100644 --- a/includes/SpecialContributions.php +++ b/includes/SpecialContributions.php @@ -6,12 +6,8 @@ /** @package MediaWiki */ class contribs_finder { - private - $dbr, - $limit, - $namespace, - $offset, - $username; + var $username, $offset, $limit, $namespace; + var $dbr; function contribs_finder($username) { $this->username = $username; @@ -116,7 +112,7 @@ class contribs_finder { return $rows[count($rows) - 1]->rev_timestamp; } - private function make_sql() { + /* private */ function make_sql() { $userCond = $condition = $index = $offsetQuery = ''; extract($this->dbr->tableNames('page', 'revision')); diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php index d61b35135c..91abcea260 100644 --- a/includes/SpecialImport.php +++ b/includes/SpecialImport.php @@ -121,15 +121,14 @@ function wfSpecialImport( $page = '' ) { * @subpackage SpecialPage */ class WikiRevision { - private - $comment = '', - $id = 0, - $minor = false, - $text = '', - $timestamp = '20010115000000', - $title = NULL, - $user = 0, - $user_text = '' ; + var $title = NULL; + var $id = 0; + var $timestamp = "20010115000000"; + var $user = 0; + var $user_text = ""; + var $text = ""; + var $comment = ""; + var $minor = false; function setTitle( $text ) { $this->title = Title::newFromText( $text ); @@ -249,11 +248,10 @@ class WikiRevision { * @subpackage SpecialPage */ class WikiImporter { - private - $lastfield, - $mPageCallback = null, - $mRevisionCallback = null, - $mSource = null ; + var $mSource = null; + var $mPageCallback = null; + var $mRevisionCallback = null; + var $lastfield; function WikiImporter( $source ) { $this->setRevisionCallback( array( &$this, "importRevision" ) ); diff --git a/includes/SpecialListusers.php b/includes/SpecialListusers.php index a3db1a7f20..028665c1b0 100644 --- a/includes/SpecialListusers.php +++ b/includes/SpecialListusers.php @@ -41,10 +41,8 @@ require_once('QueryPage.php'); * @subpackage SpecialPage */ class ListUsersPage extends QueryPage { - // Variables used by constructor - public - $requestedGroup = '', - $requestedUser = '' ; + var $requestedGroup = ''; + var $requestedUser = ''; function getName() { return 'Listusers'; diff --git a/includes/SpecialLog.php b/includes/SpecialLog.php index 4d71a6cb29..f67330677a 100644 --- a/includes/SpecialLog.php +++ b/includes/SpecialLog.php @@ -42,13 +42,8 @@ function wfSpecialLog( $par = '' ) { * @subpackage SpecialPage */ class LogReader { - private - $db, - $joinClauses, - $title = null, - $type = '', - $user = '', - $whereClauses ; + var $db, $joinClauses, $whereClauses; + var $type = '', $user = '', $title = null; /** * @param WebRequest $request For internal use use a FauxRequest object to pass arbitrary parameters. @@ -216,9 +211,8 @@ class LogViewer { /** * @var LogReader $reader */ - private - $numResults = 0, - $reader ; + var $reader; + var $numResults = 0; /** * @param LogReader &$reader where to get our data from diff --git a/includes/SpecialNewpages.php b/includes/SpecialNewpages.php index 359cdf6b7f..3f72352f61 100644 --- a/includes/SpecialNewpages.php +++ b/includes/SpecialNewpages.php @@ -16,8 +16,7 @@ require_once( 'QueryPage.php' ); * @subpackage SpecialPage */ class NewPagesPage extends QueryPage { - private - $namespace; + var $namespace; function NewPagesPage( $namespace = NS_MAIN ) { $this->namespace = $namespace; diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php index b88b6dc359..bf6c74582e 100644 --- a/includes/SpecialPage.php +++ b/includes/SpecialPage.php @@ -109,32 +109,33 @@ class SpecialPage * The name of the class, used in the URL. * Also used for the default

heading, @see getDescription() */ - private $mName; + var $mName; /** * Minimum user level required to access this page, or "" for anyone. * Also used to categorise the pages in Special:Specialpages */ - private $mRestriction; + var $mRestriction; /** * Listed in Special:Specialpages? */ - private $mListed; + var $mListed; /** * Function name called by the default execute() */ - private $mFunction; + var $mFunction; /** * File which needs to be included before the function above can be called */ - private $mFile; + var $mFile; /** * Whether or not this special page is being included from an article */ - private $mIncluding; + var $mIncluding; /** * Whether the special page can be included in an article */ - private $mIncludable; + var $mIncludable; + /**#@-*/ @@ -145,7 +146,7 @@ class SpecialPage * Use this for a special page extension * @static */ - static function addPage( &$obj ) { + function addPage( &$obj ) { global $wgSpecialPages; $wgSpecialPages[$obj->mName] = $obj; } @@ -155,7 +156,7 @@ class SpecialPage * Occasionally used to disable expensive or dangerous special pages * @static */ - static function removePage( $name ) { + function removePage( $name ) { global $wgSpecialPages; unset( $wgSpecialPages[$name] ); } @@ -165,7 +166,7 @@ class SpecialPage * @static * @param string $name */ - static function getPage( $name ) { + function getPage( $name ) { global $wgSpecialPages; if ( array_key_exists( $name, $wgSpecialPages ) ) { return $wgSpecialPages[$name]; @@ -179,7 +180,7 @@ class SpecialPage * @param string $name * @return mixed Title object if the redirect exists, otherwise NULL */ - static function getRedirect( $name ) { + function getRedirect( $name ) { global $wgUser; $redirects = array( @@ -227,7 +228,7 @@ class SpecialPage * Returns a 2d array where the first index is the restriction name * @static */ - static function getPages() { + function getPages() { global $wgSpecialPages; $pages = array( '' => array(), @@ -324,7 +325,7 @@ class SpecialPage * a redirect. * @static */ - static function capturePath( &$title ) { + function capturePath( &$title ) { global $wgOut, $wgTitle; $oldTitle = $wgTitle; diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php index 627f04bd7c..8b972b01a6 100644 --- a/includes/SpecialPreferences.php +++ b/includes/SpecialPreferences.php @@ -22,37 +22,12 @@ function wfSpecialPreferences() { * @subpackage SpecialPage */ class PreferencesForm { - - private - $mAction, - $mCols, - $mDate, - $mEmailFlag, - $mHourDiff, - $mImageSize, - $mMath, - $mNewpass, - $mNick, - $mOldpass, - $mPosted, - $mQuickbar, - $mRealName, - $mRecent, - $mReset, - $mRetypePass, - $mRows, - $mSearch, - $mSearchChars, - $mSearchLines, - $mSearchNs, - $mSkin, - $mStubs, - $mToggles, - $mUnderline, - $mUserEmail, - $mUserLanguage, - $mUserVariant, - $mWatchlistEdits ; + var $mQuickbar, $mOldpass, $mNewpass, $mRetypePass, $mStubs; + var $mRows, $mCols, $mSkin, $mMath, $mDate, $mUserEmail, $mEmailFlag, $mNick; + var $mUserLanguage, $mUserVariant; + var $mSearch, $mRecent, $mHourDiff, $mSearchLines, $mSearchChars, $mAction; + var $mReset, $mPosted, $mToggles, $mSearchNs, $mRealName, $mImageSize; + var $mUnderline, $mWatchlistEdits; /** * Constructor diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php index feaaef4481..541d7aac4a 100644 --- a/includes/SpecialUndelete.php +++ b/includes/SpecialUndelete.php @@ -27,8 +27,7 @@ function wfSpecialUndelete( $par ) { * @subpackage SpecialPage */ class PageArchive { - public - $title; + var $title; function PageArchive( &$title ) { if( is_null( $title ) ) { @@ -309,15 +308,8 @@ class PageArchive { * @subpackage SpecialPage */ class UndeleteForm { - private - $mAction, - $mAllowed, - $mComment, - $mRestore, - $mTarget, - $mTargetObj, - $mTargetTimestamp, - $mTimestamp ; + var $mAction, $mTarget, $mTimestamp, $mRestore, $mTargetObj; + var $mTargetTimestamp, $mAllowed, $mComment; function UndeleteForm( &$request, $par = "" ) { global $wgUser; diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php index 5e37f6f6bc..65ff6e2d35 100644 --- a/includes/SpecialUserlogin.php +++ b/includes/SpecialUserlogin.php @@ -25,21 +25,9 @@ function wfSpecialUserlogin() { * @subpackage SpecialPage */ class LoginForm { - private - $mAction, - $mCookieCheck, - $mCreateaccount, - $mCreateaccountMail, - $mDomain, - $mEmail, // Entered user email ?? - $mLoginattempt, - $mMailmypassword, - $mName, // Entered username - $mPassword, // Entered user password - $mPosted, - $mRemember, // bool, if user want to be remembered - $mReturnTo, // article to return to once logged in - $mRetype ; + var $mName, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted; + var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword; + var $mLoginattempt, $mRemember, $mEmail, $mDomain; /** * Constructor diff --git a/includes/SpecialWantedpages.php b/includes/SpecialWantedpages.php index 55118dcde9..92958e8d1c 100644 --- a/includes/SpecialWantedpages.php +++ b/includes/SpecialWantedpages.php @@ -16,7 +16,7 @@ require_once 'QueryPage.php'; * @subpackage SpecialPage */ class WantedPagesPage extends QueryPage { - private $nlinks; + var $nlinks; function WantedPagesPage( $inc = false, $nlinks = true ) { $this->setListoutput( $inc ); diff --git a/includes/SquidUpdate.php b/includes/SquidUpdate.php index 680b0f418c..dba47c563d 100644 --- a/includes/SquidUpdate.php +++ b/includes/SquidUpdate.php @@ -9,8 +9,7 @@ * @package MediaWiki */ class SquidUpdate { - public $urlArr; // FIXME : is it really public ? - private $mMaxTitles; + var $urlArr, $mMaxTitles; function SquidUpdate( $urlArr = Array(), $maxTitles = false ) { global $wgMaxSquidPurgeTitles; diff --git a/includes/Title.php b/includes/Title.php index 4c76682f35..3197b46ec4 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -37,24 +37,23 @@ class Title { * @access private */ - private $mTextform; # Text form (spaces not underscores) of the main part - private $mUrlform; # URL-encoded form of the main part - private $mDbkeyform; # Main part with underscores - private $mNamespace; # Namespace index, i.e. one of the NS_xxxx constants - private $mInterwiki; # Interwiki prefix (or null string) - private $mFragment; # Title fragment (i.e. the bit after the #) - private $mLatestID; # ID of most recent revision - private $mRestrictions; # Array of groups allowed to edit this article + var $mTextform; # Text form (spaces not underscores) of the main part + var $mUrlform; # URL-encoded form of the main part + var $mDbkeyform; # Main part with underscores + var $mNamespace; # Namespace index, i.e. one of the NS_xxxx constants + var $mInterwiki; # Interwiki prefix (or null string) + var $mFragment; # Title fragment (i.e. the bit after the #) + var $mArticleID; # Article ID, fetched from the link cache on demand + var $mLatestID; # ID of most recent revision + var $mRestrictions; # Array of groups allowed to edit this article # Only null or "sysop" are supported - private $mPrefixedText; # Text form including namespace/interwiki, initialised on demand - private $mDefaultNamespace; # Namespace index when there is no namespace + var $mRestrictionsLoaded; # Boolean for initialisation on demand + var $mPrefixedText; # Text form including namespace/interwiki, initialised on demand + var $mDefaultNamespace; # Namespace index when there is no namespace # Zero except in {{transclusion}} tags - private $mWatched; # Is $wgUser watching this page? NULL if unfilled, accessed through userIsWatching() + var $mWatched; # Is $wgUser watching this page? NULL if unfilled, accessed through userIsWatching() /**#@-*/ - /** @todo FIXME should those be public ? */ - public $mArticleID; # Article ID, fetched from the link cache on demand - public $mRestrictionsLoaded; # Boolean for initialisation on demand /** * Constructor @@ -105,7 +104,7 @@ class Title { * @static * @access public */ - public static function newFromText( $text, $defaultNamespace = NS_MAIN ) { + function newFromText( $text, $defaultNamespace = NS_MAIN ) { global $wgTitleCache; $fname = 'Title::newFromText'; @@ -160,7 +159,7 @@ class Title { * @static * @access public */ - public static function newFromURL( $url ) { + function newFromURL( $url ) { global $wgLegalTitleChars; $t = new Title(); @@ -216,7 +215,7 @@ class Title { * @static * @access public */ - public static function &makeTitle( $ns, $title ) { + function &makeTitle( $ns, $title ) { $t =& new Title(); $t->mInterwiki = ''; $t->mFragment = ''; @@ -239,7 +238,7 @@ class Title { * @static * @access public */ - public static function makeTitleSafe( $ns, $title ) { + function makeTitleSafe( $ns, $title ) { $t = new Title(); $t->mDbkeyform = Title::makeName( $ns, $title ); if( $t->secureAndSplit() ) { @@ -360,7 +359,7 @@ class Title { * @param string $title the DB key form the title * @return string the prefixed form of the title */ - public static function makeName( $ns, $title ) { + /* static */ function makeName( $ns, $title ) { global $wgContLang; $n = $wgContLang->getNsText( $ns ); @@ -1243,23 +1242,6 @@ class Title { return (int)$n; } - /** - * Used to grab from the logging facility the date at wich the - * article got deleted. For special pages and article that never - * got deleted, return 0. - * @return date when the title got deleted - */ - function getDeletedDate() { - $fname = 'Title::getLastDelete'; - if( $this->getNamespace() < 0 or !$this->isDeleted() ) { - $n = 0; - } else { - $dbr =& wfGetDB( DB_SLAVE ); - $n = $dbr->selectField( 'logging', 'MAX(log_timestamp)', array( 'log_namespace' => $this->getNamespace(), - 'log_title' => $this->getDBkey() ), $fname ); - } - return $n; - } /** * Get the article ID for this Title from the link cache, * adding it if necessary diff --git a/includes/User.php b/includes/User.php index c6e2252d97..cb6a6de588 100644 --- a/includes/User.php +++ b/includes/User.php @@ -27,26 +27,26 @@ class User { /**@{{ * @private */ - private $mBlockedby; //!< - private $mBlockreason; //!< - private $mDataLoaded; //!< - private $mEmail; //!< - private $mEmailAuthenticated; //!< - private $mGroups; //!< - private $mHash; //!< - private $mId; //!< - private $mName; //!< - private $mNewpassword; //!< - private $mNewtalk; //!< - private $mOptions; //!< - private $mPassword; //!< - private $mRealName; //!< - private $mRegistration; //!< - private $mRights; //!< - private $mSkin; //!< - private $mToken; //!< - private $mTouched; //!< - private $mVersion; //!< serialized version + var $mBlockedby; //!< + var $mBlockreason; //!< + var $mDataLoaded; //!< + var $mEmail; //!< + var $mEmailAuthenticated; //!< + var $mGroups; //!< + var $mHash; //!< + var $mId; //!< + var $mName; //!< + var $mNewpassword; //!< + var $mNewtalk; //!< + var $mOptions; //!< + var $mPassword; //!< + var $mRealName; //!< + var $mRegistration; //!< + var $mRights; //!< + var $mSkin; //!< + var $mToken; //!< + var $mTouched; //!< + var $mVersion; //!< serialized version /**@}} */ /** Constructor using User:loadDefaults() */ @@ -61,7 +61,7 @@ class User { * @return User * @static */ - static function newFromName( $name ) { + function newFromName( $name ) { # Force usernames to capital global $wgContLang; $name = $wgContLang->ucfirst( $name ); @@ -168,7 +168,7 @@ class User { * @return integer|null Database user id (null: if non existent * @static */ - public static function idFromName( $name ) { + function idFromName( $name ) { $fname = "User::idFromName"; $nt = Title::newFromText( $name ); @@ -641,9 +641,8 @@ class User { /** * Initialise php session - * @static */ - static function SetupSession() { + function SetupSession() { global $wgSessionsInMemcached, $wgCookiePath, $wgCookieDomain; if( $wgSessionsInMemcached ) { require_once( 'MemcachedSessions.php' ); @@ -661,7 +660,7 @@ class User { * Create a new user object using data from session * @static */ - static function loadFromSession() { + function loadFromSession() { global $wgMemc, $wgDBname, $wgCookiePrefix; if ( isset( $_SESSION['wsUserID'] ) ) { diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php index 2697a197a5..3885bb985a 100644 --- a/includes/WatchedItem.php +++ b/includes/WatchedItem.php @@ -9,9 +9,7 @@ * @package MediaWiki */ class WatchedItem { - private - $mTitle, - $mUser; + var $mTitle, $mUser; /** * Create a WatchedItem object with the given user and title diff --git a/includes/WebRequest.php b/includes/WebRequest.php index f4b029461b..736e215fdd 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -445,9 +445,8 @@ class WebRequest { * @package MediaWiki */ class FauxRequest extends WebRequest { - private - $data = null, - $wasPosted = false ; + var $data = null; + var $wasPosted = false; function FauxRequest( $data, $wasPosted = false ) { if( is_array( $data ) ) { diff --git a/includes/Wiki.php b/includes/Wiki.php index 0938bd7071..be3a8b41c7 100644 --- a/includes/Wiki.php +++ b/includes/Wiki.php @@ -5,8 +5,8 @@ class MediaWiki { - public $GET; /* Stores the $_GET variables at time of creation, can be changed */ - public $params = array(); + var $GET; /* Stores the $_GET variables at time of creation, can be changed */ + var $params = array(); /** * Constructor diff --git a/languages/Language.php b/languages/Language.php index 9f70456e45..17b5d12fc0 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -290,7 +290,7 @@ if (!$wgCachedMessageArrays) { /* a fake language converter */ class fakeConverter { - private $mLang; + var $mLang; function fakeConverter($langobj) {$this->mLang = $langobj;} function convert($t, $i) {return $t;} function parserConvert($t, $p) {return $t;} @@ -309,7 +309,7 @@ class fakeConverter { #-------------------------------------------------------------------------- class Language { - private $mConverter; + var $mConverter; function Language() { # Copies any missing values in the specified arrays from En to the current language diff --git a/languages/Messages.php b/languages/Messages.php index 1f259380c9..fa4908baa2 100644 --- a/languages/Messages.php +++ b/languages/Messages.php @@ -503,8 +503,6 @@ If you are here by mistake, just click your browser's '''back''' button.", 'anontalkpagetext' => "----''This is the discussion page for an anonymous user who has not created an account yet or who does not use it. We therefore have to use the numerical [[IP address]] to identify him/her. Such an IP address can be shared by several users. If you are an anonymous user and feel that irrelevant comments have been directed at you, please [[Special:Userlogin|create an account or log in]] to avoid future confusion with other anonymous users.''", 'noarticletext' => 'There is currently no text in this page, you can [[{{ns:special}}:Search/{{PAGENAME}}|search for this page title]] in other pages or [{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} edit this page].', 'noarticletextanon' => '{{int:noarticletext}}', -'noarticletextdeleted' => 'There is currently no text in this page, you can [[{{ns:special}}:Search/{{PAGENAME}}|search for this page title]] in other pages or [{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} edit this page].', -'noarticletextdeletedanon' => '{{int:noarticletext}}', 'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes. '''Mozilla / Firefox / Safari:''' hold down ''Shift'' while clicking ''Reload'', or press ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac); '''IE:''' hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''; '''Konqueror:''': simply click the ''Reload'' button, or press ''F5''; '''Opera''' users may need to completely clear their cache in ''Tools→Preferences''.", 'usercssjsyoucanpreview' => 'Tip: Use the \'Show preview\' button to test your new CSS/JS before saving.', 'usercsspreview' => '\'\'\'Remember that you are only previewing your user CSS, it has not yet been saved!\'\'\'',