From c4372dd38a4d109b4f3881ea63b667e33adbe503 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 26 Apr 2012 18:23:31 +0200 Subject: Update to MediaWiki 1.18.3 --- includes/CryptRand.php | 11 ++++++++--- includes/DefaultSettings.php | 2 +- includes/User.php | 5 +++-- includes/api/ApiBase.php | 2 +- includes/api/ApiBlock.php | 2 +- includes/api/ApiComparePages.php | 2 +- includes/api/ApiDelete.php | 2 +- includes/api/ApiDisabled.php | 2 +- includes/api/ApiEditPage.php | 2 +- includes/api/ApiEmailUser.php | 2 +- includes/api/ApiExpandTemplates.php | 2 +- includes/api/ApiFeedContributions.php | 2 +- includes/api/ApiFeedWatchlist.php | 2 +- includes/api/ApiFileRevert.php | 2 +- includes/api/ApiFormatBase.php | 4 ++-- includes/api/ApiFormatDbg.php | 2 +- includes/api/ApiFormatDump.php | 2 +- includes/api/ApiFormatJson.php | 2 +- includes/api/ApiFormatPhp.php | 2 +- includes/api/ApiFormatRaw.php | 2 +- includes/api/ApiFormatTxt.php | 2 +- includes/api/ApiFormatWddx.php | 2 +- includes/api/ApiFormatXml.php | 2 +- includes/api/ApiFormatYaml.php | 2 +- includes/api/ApiHelp.php | 2 +- includes/api/ApiImport.php | 2 +- includes/api/ApiLogin.php | 2 +- includes/api/ApiLogout.php | 2 +- includes/api/ApiMain.php | 10 ++++++++-- includes/api/ApiMove.php | 2 +- includes/api/ApiOpenSearch.php | 2 +- includes/api/ApiPageSet.php | 2 +- includes/api/ApiParamInfo.php | 2 +- includes/api/ApiParse.php | 2 +- includes/api/ApiPatrol.php | 2 +- includes/api/ApiProtect.php | 2 +- includes/api/ApiPurge.php | 2 +- includes/api/ApiQuery.php | 2 +- includes/api/ApiQueryAllCategories.php | 2 +- includes/api/ApiQueryAllLinks.php | 2 +- includes/api/ApiQueryAllUsers.php | 2 +- includes/api/ApiQueryAllimages.php | 2 +- includes/api/ApiQueryAllmessages.php | 2 +- includes/api/ApiQueryAllpages.php | 2 +- includes/api/ApiQueryBacklinks.php | 2 +- includes/api/ApiQueryBase.php | 2 +- includes/api/ApiQueryBlocks.php | 2 +- includes/api/ApiQueryCategories.php | 2 +- includes/api/ApiQueryCategoryInfo.php | 2 +- includes/api/ApiQueryCategoryMembers.php | 2 +- includes/api/ApiQueryDeletedrevs.php | 2 +- includes/api/ApiQueryDisabled.php | 2 +- includes/api/ApiQueryDuplicateFiles.php | 2 +- includes/api/ApiQueryExtLinksUsage.php | 2 +- includes/api/ApiQueryExternalLinks.php | 2 +- includes/api/ApiQueryFilearchive.php | 2 +- includes/api/ApiQueryIWBacklinks.php | 2 +- includes/api/ApiQueryIWLinks.php | 2 +- includes/api/ApiQueryImageInfo.php | 2 +- includes/api/ApiQueryImages.php | 2 +- includes/api/ApiQueryInfo.php | 2 +- includes/api/ApiQueryLangBacklinks.php | 2 +- includes/api/ApiQueryLangLinks.php | 2 +- includes/api/ApiQueryLinks.php | 2 +- includes/api/ApiQueryLogEvents.php | 2 +- includes/api/ApiQueryPageProps.php | 2 +- includes/api/ApiQueryProtectedTitles.php | 2 +- includes/api/ApiQueryQueryPage.php | 2 +- includes/api/ApiQueryRecentChanges.php | 2 +- includes/api/ApiQueryRevisions.php | 2 +- includes/api/ApiQuerySearch.php | 2 +- includes/api/ApiQuerySiteinfo.php | 2 +- includes/api/ApiQueryStashImageInfo.php | 2 +- includes/api/ApiQueryTags.php | 2 +- includes/api/ApiQueryUserContributions.php | 2 +- includes/api/ApiQueryUserInfo.php | 2 +- includes/api/ApiQueryUsers.php | 2 +- includes/api/ApiQueryWatchlist.php | 2 +- includes/api/ApiQueryWatchlistRaw.php | 2 +- includes/api/ApiResult.php | 2 +- includes/api/ApiRollback.php | 2 +- includes/api/ApiRsd.php | 4 ++-- includes/api/ApiUnblock.php | 2 +- includes/api/ApiUndelete.php | 2 +- includes/api/ApiUpload.php | 2 +- includes/api/ApiUserrights.php | 2 +- includes/api/ApiWatch.php | 2 +- includes/json/Services_JSON.php | 2 +- includes/parser/CoreParserFunctions.php | 6 +++++- includes/specials/SpecialPasswordReset.php | 11 ++++++----- 90 files changed, 117 insertions(+), 100 deletions(-) (limited to 'includes') diff --git a/includes/CryptRand.php b/includes/CryptRand.php index 10f379cb..e4be1b37 100644 --- a/includes/CryptRand.php +++ b/includes/CryptRand.php @@ -120,7 +120,7 @@ class MWCryptRand { /** * Randomly hash data while mixing in clock drift data for randomness * - * @param $data The data to randomly hash. + * @param $data string The data to randomly hash. * @return String The hashed bytes * @author Tim Starling */ @@ -166,7 +166,7 @@ class MWCryptRand { /** * Return a rolling random state initially build using data from unstable sources - * @return A new weak random state + * @return string A new weak random state */ protected function randomState() { static $state = null; @@ -184,6 +184,7 @@ class MWCryptRand { /** * Decide on the best acceptable hash algorithm we have available for hash() + * @throws MWException * @return String A hash algorithm */ protected function hashAlgo() { @@ -227,6 +228,7 @@ class MWCryptRand { * Generate an acceptably unstable one-way-hash of some text * making use of the best hash algorithm that we have available. * + * @param $data string * @return String A raw hash of the data */ protected function hash( $data ) { @@ -237,6 +239,8 @@ class MWCryptRand { * Generate an acceptably unstable one-way-hmac of some text * making use of the best hash algorithm that we have available. * + * @param $data string + * @param $key string * @return String A raw hash of the data */ protected function hmac( $data, $key ) { @@ -282,7 +286,7 @@ class MWCryptRand { if ( $iv === false ) { wfDebug( __METHOD__ . ": mcrypt_create_iv returned false.\n" ); } else { - $bytes .= $iv; + $buffer .= $iv; wfDebug( __METHOD__ . ": mcrypt_create_iv generated " . strlen( $iv ) . " bytes of randomness.\n" ); } wfProfileOut( __METHOD__ . '-mcrypt' ); @@ -409,6 +413,7 @@ class MWCryptRand { /** * Return a singleton instance of MWCryptRand + * @return MWCryptRand */ protected static function singleton() { if ( is_null( self::$singleton ) ) { diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 7cea30f6..29d98d58 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -33,7 +33,7 @@ $wgConf = new SiteConfiguration; /** @endcond */ /** MediaWiki version number */ -$wgVersion = '1.18.2'; +$wgVersion = '1.18.3'; /** Name of the site. It must be changed in LocalSettings.php */ $wgSitename = 'MediaWiki'; diff --git a/includes/User.php b/includes/User.php index 705fd291..af05926c 100644 --- a/includes/User.php +++ b/includes/User.php @@ -3272,11 +3272,12 @@ class User { global $wgUserEmailConfirmationTokenExpiry; $now = time(); $expires = $now + $wgUserEmailConfirmationTokenExpiry; + $expiration = wfTimestamp( TS_MW, $expires ); $this->load(); $token = MWCryptRand::generateHex( 32 ); $hash = md5( $token ); $this->mEmailToken = $hash; - $this->mEmailTokenExpires = wfTimestamp( TS_MW, $expires ); + $this->mEmailTokenExpires = $expiration; return $token; } @@ -3863,7 +3864,7 @@ class User { } elseif ( $type == ':B:' ) { # Salted list( $salt, $realHash ) = explode( ':', substr( $hash, 3 ), 2 ); - return md5( $salt.'-'.md5( $password ) ) == $realHash; + return md5( $salt.'-'.md5( $password ) ) === $realHash; } else { # Old-style return self::oldCrypt( $password, $userId ) === $hash; diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 30e42934..9fe96199 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -1501,6 +1501,6 @@ abstract class ApiBase { * @return string */ public static function getBaseVersion() { - return __CLASS__ . ': $Id: ApiBase.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php index 8d718ab2..bb2bb253 100644 --- a/includes/api/ApiBlock.php +++ b/includes/api/ApiBlock.php @@ -220,6 +220,6 @@ class ApiBlock extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiBlock.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php index d43fa53f..59f8555b 100644 --- a/includes/api/ApiComparePages.php +++ b/includes/api/ApiComparePages.php @@ -125,6 +125,6 @@ class ApiComparePages extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiComparePages.php 92400 2011-07-17 16:51:11Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php index 58befbfe..d6cc21b3 100644 --- a/includes/api/ApiDelete.php +++ b/includes/api/ApiDelete.php @@ -281,6 +281,6 @@ class ApiDelete extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiDelete.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiDisabled.php b/includes/api/ApiDisabled.php index 947267f3..ad731bb4 100644 --- a/includes/api/ApiDisabled.php +++ b/includes/api/ApiDisabled.php @@ -70,6 +70,6 @@ class ApiDisabled extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiDisabled.php 79969 2011-01-10 22:36:26Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index ffc82640..2b949ba9 100644 --- a/includes/api/ApiEditPage.php +++ b/includes/api/ApiEditPage.php @@ -526,6 +526,6 @@ class ApiEditPage extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiEditPage.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiEmailUser.php b/includes/api/ApiEmailUser.php index 9ce43183..46e8d523 100644 --- a/includes/api/ApiEmailUser.php +++ b/includes/api/ApiEmailUser.php @@ -149,6 +149,6 @@ class ApiEmailUser extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiEmailUser.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiExpandTemplates.php b/includes/api/ApiExpandTemplates.php index 6ec18463..dfa520a2 100644 --- a/includes/api/ApiExpandTemplates.php +++ b/includes/api/ApiExpandTemplates.php @@ -123,6 +123,6 @@ class ApiExpandTemplates extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiExpandTemplates.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFeedContributions.php b/includes/api/ApiFeedContributions.php index c06b71af..c1e6ff6e 100644 --- a/includes/api/ApiFeedContributions.php +++ b/includes/api/ApiFeedContributions.php @@ -202,6 +202,6 @@ class ApiFeedContributions extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFeedContributions.php 95607 2011-08-27 19:28:13Z hashar $'; + return __CLASS__ . ': $Id$'; } } \ No newline at end of file diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php index 75ce7ca0..dd7e3d8f 100644 --- a/includes/api/ApiFeedWatchlist.php +++ b/includes/api/ApiFeedWatchlist.php @@ -226,6 +226,6 @@ class ApiFeedWatchlist extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFeedWatchlist.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFileRevert.php b/includes/api/ApiFileRevert.php index 1540fe6c..5ff50512 100644 --- a/includes/api/ApiFileRevert.php +++ b/includes/api/ApiFileRevert.php @@ -184,6 +184,6 @@ class ApiFileRevert extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFileRevert.php 92400 2011-07-17 16:51:11Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php index ce881599..8c8235b8 100644 --- a/includes/api/ApiFormatBase.php +++ b/includes/api/ApiFormatBase.php @@ -301,7 +301,7 @@ See complete documentation, or } public static function getBaseVersion() { - return __CLASS__ . ': $Id: ApiFormatBase.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } @@ -370,6 +370,6 @@ class ApiFormatFeedWrapper extends ApiFormatBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFormatBase.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFormatDbg.php b/includes/api/ApiFormatDbg.php index 00b03494..32f223d7 100644 --- a/includes/api/ApiFormatDbg.php +++ b/includes/api/ApiFormatDbg.php @@ -55,6 +55,6 @@ class ApiFormatDbg extends ApiFormatBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFormatDbg.php 78829 2010-12-22 20:52:06Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFormatDump.php b/includes/api/ApiFormatDump.php index b88572e9..bde3e56d 100644 --- a/includes/api/ApiFormatDump.php +++ b/includes/api/ApiFormatDump.php @@ -59,6 +59,6 @@ class ApiFormatDump extends ApiFormatBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFormatDump.php 79969 2011-01-10 22:36:26Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php index 92689084..e3755d73 100644 --- a/includes/api/ApiFormatJson.php +++ b/includes/api/ApiFormatJson.php @@ -97,6 +97,6 @@ class ApiFormatJson extends ApiFormatBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFormatJson.php 78829 2010-12-22 20:52:06Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFormatPhp.php b/includes/api/ApiFormatPhp.php index 010966d6..cfcc2a03 100644 --- a/includes/api/ApiFormatPhp.php +++ b/includes/api/ApiFormatPhp.php @@ -52,6 +52,6 @@ class ApiFormatPhp extends ApiFormatBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFormatPhp.php 78829 2010-12-22 20:52:06Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFormatRaw.php b/includes/api/ApiFormatRaw.php index 3b0c10ea..75912871 100644 --- a/includes/api/ApiFormatRaw.php +++ b/includes/api/ApiFormatRaw.php @@ -73,6 +73,6 @@ class ApiFormatRaw extends ApiFormatBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFormatRaw.php 82429 2011-02-19 00:30:18Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFormatTxt.php b/includes/api/ApiFormatTxt.php index bb5a3ba1..54a620fc 100644 --- a/includes/api/ApiFormatTxt.php +++ b/includes/api/ApiFormatTxt.php @@ -55,6 +55,6 @@ class ApiFormatTxt extends ApiFormatBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFormatTxt.php 78829 2010-12-22 20:52:06Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFormatWddx.php b/includes/api/ApiFormatWddx.php index 2598cc55..f5cace21 100644 --- a/includes/api/ApiFormatWddx.php +++ b/includes/api/ApiFormatWddx.php @@ -117,6 +117,6 @@ class ApiFormatWddx extends ApiFormatBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFormatWddx.php 78829 2010-12-22 20:52:06Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFormatXml.php b/includes/api/ApiFormatXml.php index 3bdfdfa3..06bd9f33 100644 --- a/includes/api/ApiFormatXml.php +++ b/includes/api/ApiFormatXml.php @@ -226,6 +226,6 @@ class ApiFormatXml extends ApiFormatBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFormatXml.php 104476 2011-11-28 20:08:17Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiFormatYaml.php b/includes/api/ApiFormatYaml.php index d62bbbba..ecf35900 100644 --- a/includes/api/ApiFormatYaml.php +++ b/includes/api/ApiFormatYaml.php @@ -44,6 +44,6 @@ class ApiFormatYaml extends ApiFormatJson { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFormatYaml.php 86302 2011-04-18 11:42:44Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php index 4b2ced7e..f2af822a 100644 --- a/includes/api/ApiHelp.php +++ b/includes/api/ApiHelp.php @@ -163,6 +163,6 @@ class ApiHelp extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiHelp.php 104439 2011-11-28 15:22:23Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php index a1e5709a..ce740efc 100644 --- a/includes/api/ApiImport.php +++ b/includes/api/ApiImport.php @@ -170,7 +170,7 @@ class ApiImport extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiImport.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php index a09f0335..1b17e43b 100644 --- a/includes/api/ApiLogin.php +++ b/includes/api/ApiLogin.php @@ -217,6 +217,6 @@ class ApiLogin extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiLogin.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiLogout.php b/includes/api/ApiLogout.php index 3639df3b..b5dd7ac9 100644 --- a/includes/api/ApiLogout.php +++ b/includes/api/ApiLogout.php @@ -78,6 +78,6 @@ class ApiLogout extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiLogout.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index 85a43aba..b7e118cf 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -580,8 +580,14 @@ class ApiMain extends ApiBase { $moduleParams = $module->extractRequestParams(); // Die if token required, but not provided (unless there is a gettoken parameter) + if ( isset( $moduleParams['gettoken'] ) ) { + $gettoken = $moduleParams['gettoken']; + } else { + $gettoken = false; + } + $salt = $module->getTokenSalt(); - if ( $salt !== false && !$moduleParams['gettoken'] ) { + if ( $salt !== false && !$gettoken ) { if ( !isset( $moduleParams['token'] ) ) { $this->dieUsageMsg( array( 'missingparam', 'token' ) ); } else { @@ -988,7 +994,7 @@ class ApiMain extends ApiBase { public function getVersion() { $vers = array(); $vers[] = 'MediaWiki: ' . SpecialVersion::getVersion() . "\n https://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/"; - $vers[] = __CLASS__ . ': $Id: ApiMain.php 104449 2011-11-28 15:52:04Z reedy $'; + $vers[] = __CLASS__ . ': $Id$'; $vers[] = ApiBase::getBaseVersion(); $vers[] = ApiFormatBase::getBaseVersion(); $vers[] = ApiQueryBase::getBaseVersion(); diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php index f15a086c..a0b7bcbe 100644 --- a/includes/api/ApiMove.php +++ b/includes/api/ApiMove.php @@ -265,6 +265,6 @@ class ApiMove extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiMove.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php index 084c9860..65ee0db9 100644 --- a/includes/api/ApiOpenSearch.php +++ b/includes/api/ApiOpenSearch.php @@ -130,6 +130,6 @@ class ApiOpenSearch extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiOpenSearch.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php index cf10a9ac..4718221d 100644 --- a/includes/api/ApiPageSet.php +++ b/includes/api/ApiPageSet.php @@ -775,6 +775,6 @@ class ApiPageSet extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiPageSet.php 89574 2011-06-06 15:58:55Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php index 5670b041..ad098920 100644 --- a/includes/api/ApiParamInfo.php +++ b/includes/api/ApiParamInfo.php @@ -255,6 +255,6 @@ class ApiParamInfo extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiParamInfo.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php index fbbd881b..a3159186 100644 --- a/includes/api/ApiParse.php +++ b/includes/api/ApiParse.php @@ -595,6 +595,6 @@ class ApiParse extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiParse.php 109694 2012-01-21 21:44:21Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiPatrol.php b/includes/api/ApiPatrol.php index 8066e655..8e6e8738 100644 --- a/includes/api/ApiPatrol.php +++ b/includes/api/ApiPatrol.php @@ -115,6 +115,6 @@ class ApiPatrol extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiPatrol.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php index 5556262e..ac1e0736 100644 --- a/includes/api/ApiProtect.php +++ b/includes/api/ApiProtect.php @@ -229,6 +229,6 @@ class ApiProtect extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiProtect.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php index bdf911cb..ac5f0207 100644 --- a/includes/api/ApiPurge.php +++ b/includes/api/ApiPurge.php @@ -147,6 +147,6 @@ class ApiPurge extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiPurge.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php index 49fd8569..717b43b4 100644 --- a/includes/api/ApiQuery.php +++ b/includes/api/ApiQuery.php @@ -713,7 +713,7 @@ class ApiQuery extends ApiBase { public function getVersion() { $psModule = new ApiPageSet( $this ); $vers = array(); - $vers[] = __CLASS__ . ': $Id: ApiQuery.php 104449 2011-11-28 15:52:04Z reedy $'; + $vers[] = __CLASS__ . ': $Id$'; $vers[] = $psModule->getVersion(); return $vers; } diff --git a/includes/api/ApiQueryAllCategories.php b/includes/api/ApiQueryAllCategories.php index c7f4b0aa..fc56965e 100644 --- a/includes/api/ApiQueryAllCategories.php +++ b/includes/api/ApiQueryAllCategories.php @@ -208,6 +208,6 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryAllCategories.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryAllLinks.php b/includes/api/ApiQueryAllLinks.php index 90620e91..822d0136 100644 --- a/includes/api/ApiQueryAllLinks.php +++ b/includes/api/ApiQueryAllLinks.php @@ -232,6 +232,6 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryAllLinks.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php index c0984d95..0443269e 100644 --- a/includes/api/ApiQueryAllUsers.php +++ b/includes/api/ApiQueryAllUsers.php @@ -373,6 +373,6 @@ class ApiQueryAllUsers extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryAllUsers.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryAllimages.php b/includes/api/ApiQueryAllimages.php index cafff871..f0fc39e3 100644 --- a/includes/api/ApiQueryAllimages.php +++ b/includes/api/ApiQueryAllimages.php @@ -265,6 +265,6 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryAllimages.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryAllmessages.php b/includes/api/ApiQueryAllmessages.php index a26011bc..d636c613 100644 --- a/includes/api/ApiQueryAllmessages.php +++ b/includes/api/ApiQueryAllmessages.php @@ -258,6 +258,6 @@ class ApiQueryAllmessages extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryAllmessages.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryAllpages.php b/includes/api/ApiQueryAllpages.php index 42928418..4a216670 100644 --- a/includes/api/ApiQueryAllpages.php +++ b/includes/api/ApiQueryAllpages.php @@ -330,6 +330,6 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryAllpages.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryBacklinks.php b/includes/api/ApiQueryBacklinks.php index 472406ac..8e2639f3 100644 --- a/includes/api/ApiQueryBacklinks.php +++ b/includes/api/ApiQueryBacklinks.php @@ -535,6 +535,6 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryBacklinks.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php index 69e0a893..130d0403 100644 --- a/includes/api/ApiQueryBase.php +++ b/includes/api/ApiQueryBase.php @@ -555,7 +555,7 @@ abstract class ApiQueryBase extends ApiBase { * @return string */ public static function getBaseVersion() { - return __CLASS__ . ': $Id: ApiQueryBase.php 103029 2011-11-14 20:58:30Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php index 503af7c7..cfcaf0b3 100644 --- a/includes/api/ApiQueryBlocks.php +++ b/includes/api/ApiQueryBlocks.php @@ -307,6 +307,6 @@ class ApiQueryBlocks extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryBlocks.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryCategories.php b/includes/api/ApiQueryCategories.php index c2942493..a6bca698 100644 --- a/includes/api/ApiQueryCategories.php +++ b/includes/api/ApiQueryCategories.php @@ -255,6 +255,6 @@ class ApiQueryCategories extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryCategories.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryCategoryInfo.php b/includes/api/ApiQueryCategoryInfo.php index dd3bc391..3130140f 100644 --- a/includes/api/ApiQueryCategoryInfo.php +++ b/includes/api/ApiQueryCategoryInfo.php @@ -124,6 +124,6 @@ class ApiQueryCategoryInfo extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryCategoryInfo.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php index e48789fc..c916f5c1 100644 --- a/includes/api/ApiQueryCategoryMembers.php +++ b/includes/api/ApiQueryCategoryMembers.php @@ -406,6 +406,6 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryCategoryMembers.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php index f58b9ee5..e226070c 100644 --- a/includes/api/ApiQueryDeletedrevs.php +++ b/includes/api/ApiQueryDeletedrevs.php @@ -403,6 +403,6 @@ class ApiQueryDeletedrevs extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryDeletedrevs.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryDisabled.php b/includes/api/ApiQueryDisabled.php index c9edd2e4..ab08042a 100644 --- a/includes/api/ApiQueryDisabled.php +++ b/includes/api/ApiQueryDisabled.php @@ -68,6 +68,6 @@ class ApiQueryDisabled extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryDisabled.php 79969 2011-01-10 22:36:26Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryDuplicateFiles.php b/includes/api/ApiQueryDuplicateFiles.php index 4c7c1fc2..a68e178d 100644 --- a/includes/api/ApiQueryDuplicateFiles.php +++ b/includes/api/ApiQueryDuplicateFiles.php @@ -173,6 +173,6 @@ class ApiQueryDuplicateFiles extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryDuplicateFiles.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryExtLinksUsage.php b/includes/api/ApiQueryExtLinksUsage.php index 89928372..a2b2e318 100644 --- a/includes/api/ApiQueryExtLinksUsage.php +++ b/includes/api/ApiQueryExtLinksUsage.php @@ -258,6 +258,6 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryExtLinksUsage.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryExternalLinks.php b/includes/api/ApiQueryExternalLinks.php index ca1efbb1..95297628 100644 --- a/includes/api/ApiQueryExternalLinks.php +++ b/includes/api/ApiQueryExternalLinks.php @@ -160,6 +160,6 @@ class ApiQueryExternalLinks extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryExternalLinks.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php index 541b25fc..e746a6c4 100644 --- a/includes/api/ApiQueryFilearchive.php +++ b/includes/api/ApiQueryFilearchive.php @@ -294,6 +294,6 @@ class ApiQueryFilearchive extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryFilearchive.php 91246 2011-07-01 02:25:19Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryIWBacklinks.php b/includes/api/ApiQueryIWBacklinks.php index 1a8e9720..8b3c8af1 100644 --- a/includes/api/ApiQueryIWBacklinks.php +++ b/includes/api/ApiQueryIWBacklinks.php @@ -215,6 +215,6 @@ class ApiQueryIWBacklinks extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryIWBacklinks.php 84257 2011-03-18 19:15:33Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryIWLinks.php b/includes/api/ApiQueryIWLinks.php index 3215a96e..30e44ae4 100644 --- a/includes/api/ApiQueryIWLinks.php +++ b/includes/api/ApiQueryIWLinks.php @@ -174,6 +174,6 @@ class ApiQueryIWLinks extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryIWLinks.php 96475 2011-09-07 19:37:56Z catrope $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php index 5bacd636..ab179b9f 100644 --- a/includes/api/ApiQueryImageInfo.php +++ b/includes/api/ApiQueryImageInfo.php @@ -580,6 +580,6 @@ class ApiQueryImageInfo extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryImageInfo.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryImages.php b/includes/api/ApiQueryImages.php index 9dfdf341..5fbdc895 100644 --- a/includes/api/ApiQueryImages.php +++ b/includes/api/ApiQueryImages.php @@ -190,6 +190,6 @@ class ApiQueryImages extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryImages.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php index fef1c6fc..c2f4dc92 100644 --- a/includes/api/ApiQueryInfo.php +++ b/includes/api/ApiQueryInfo.php @@ -733,6 +733,6 @@ class ApiQueryInfo extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryInfo.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryLangBacklinks.php b/includes/api/ApiQueryLangBacklinks.php index e09384e5..959ee789 100644 --- a/includes/api/ApiQueryLangBacklinks.php +++ b/includes/api/ApiQueryLangBacklinks.php @@ -215,6 +215,6 @@ class ApiQueryLangBacklinks extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryLangBacklinks.php 88429 2011-05-19 21:13:03Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryLangLinks.php b/includes/api/ApiQueryLangLinks.php index b2a974ad..942655f4 100644 --- a/includes/api/ApiQueryLangLinks.php +++ b/includes/api/ApiQueryLangLinks.php @@ -171,6 +171,6 @@ class ApiQueryLangLinks extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryLangLinks.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php index fa2495a9..55217e2f 100644 --- a/includes/api/ApiQueryLinks.php +++ b/includes/api/ApiQueryLinks.php @@ -245,6 +245,6 @@ class ApiQueryLinks extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryLinks.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php index 1420e0a7..669ab71f 100644 --- a/includes/api/ApiQueryLogEvents.php +++ b/includes/api/ApiQueryLogEvents.php @@ -456,6 +456,6 @@ class ApiQueryLogEvents extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryLogEvents.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryPageProps.php b/includes/api/ApiQueryPageProps.php index 64b8511d..56213fa3 100644 --- a/includes/api/ApiQueryPageProps.php +++ b/includes/api/ApiQueryPageProps.php @@ -153,6 +153,6 @@ class ApiQueryPageProps extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryPageProps.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryProtectedTitles.php b/includes/api/ApiQueryProtectedTitles.php index 14df7446..ff703cda 100644 --- a/includes/api/ApiQueryProtectedTitles.php +++ b/includes/api/ApiQueryProtectedTitles.php @@ -235,6 +235,6 @@ class ApiQueryProtectedTitles extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryProtectedTitles.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryQueryPage.php b/includes/api/ApiQueryQueryPage.php index e22cf8eb..b38df6b6 100644 --- a/includes/api/ApiQueryQueryPage.php +++ b/includes/api/ApiQueryQueryPage.php @@ -193,6 +193,6 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryQueryPage.php 99989 2011-10-16 22:24:58Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php index b144a7cf..9ce6688e 100644 --- a/includes/api/ApiQueryRecentChanges.php +++ b/includes/api/ApiQueryRecentChanges.php @@ -644,6 +644,6 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryRecentChanges.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php index de7d2c2d..401406bb 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -673,6 +673,6 @@ class ApiQueryRevisions extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryRevisions.php 108687 2012-01-11 21:59:55Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php index 42bed93a..5c133b7d 100644 --- a/includes/api/ApiQuerySearch.php +++ b/includes/api/ApiQuerySearch.php @@ -306,6 +306,6 @@ class ApiQuerySearch extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQuerySearch.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php index b6cedc6c..56743189 100644 --- a/includes/api/ApiQuerySiteinfo.php +++ b/includes/api/ApiQuerySiteinfo.php @@ -619,6 +619,6 @@ class ApiQuerySiteinfo extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQuerySiteinfo.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryStashImageInfo.php b/includes/api/ApiQueryStashImageInfo.php index 9a6e8530..b1903025 100644 --- a/includes/api/ApiQueryStashImageInfo.php +++ b/includes/api/ApiQueryStashImageInfo.php @@ -130,7 +130,7 @@ class ApiQueryStashImageInfo extends ApiQueryImageInfo { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryStashImageInfo.php 92459 2011-07-18 19:31:38Z raindrift $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryTags.php b/includes/api/ApiQueryTags.php index 14ca14b7..4ab0c3d1 100644 --- a/includes/api/ApiQueryTags.php +++ b/includes/api/ApiQueryTags.php @@ -185,6 +185,6 @@ class ApiQueryTags extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryTags.php 90542 2011-06-21 20:05:00Z ialex $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryUserContributions.php b/includes/api/ApiQueryUserContributions.php index e958c729..f6a9fe46 100644 --- a/includes/api/ApiQueryUserContributions.php +++ b/includes/api/ApiQueryUserContributions.php @@ -475,6 +475,6 @@ class ApiQueryContributions extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryUserContributions.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php index 8a8ce118..2411bee9 100644 --- a/includes/api/ApiQueryUserInfo.php +++ b/includes/api/ApiQueryUserInfo.php @@ -250,6 +250,6 @@ class ApiQueryUserInfo extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryUserInfo.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php index 6eee1331..31437827 100644 --- a/includes/api/ApiQueryUsers.php +++ b/includes/api/ApiQueryUsers.php @@ -331,6 +331,6 @@ class ApiQueryUsers extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryUsers.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index a5eb23eb..77ecb90a 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -454,6 +454,6 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryWatchlist.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiQueryWatchlistRaw.php b/includes/api/ApiQueryWatchlistRaw.php index b008eab2..126f6d89 100644 --- a/includes/api/ApiQueryWatchlistRaw.php +++ b/includes/api/ApiQueryWatchlistRaw.php @@ -205,6 +205,6 @@ class ApiQueryWatchlistRaw extends ApiQueryGeneratorBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryWatchlistRaw.php 88416 2011-05-19 17:51:16Z hashar $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php index f7ea0045..a8ca6046 100644 --- a/includes/api/ApiResult.php +++ b/includes/api/ApiResult.php @@ -372,6 +372,6 @@ class ApiResult extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiResult.php 91144 2011-06-29 23:46:39Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php index a149fcaf..154e5dfb 100644 --- a/includes/api/ApiRollback.php +++ b/includes/api/ApiRollback.php @@ -196,6 +196,6 @@ class ApiRollback extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiRollback.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiRsd.php b/includes/api/ApiRsd.php index f9a4d285..e4410379 100644 --- a/includes/api/ApiRsd.php +++ b/includes/api/ApiRsd.php @@ -161,7 +161,7 @@ class ApiRsd extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiRsd.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } @@ -176,6 +176,6 @@ class ApiFormatXmlRsd extends ApiFormatXml { } public function getVersion() { - return __CLASS__ . ': $Id: ApiRsd.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiUnblock.php b/includes/api/ApiUnblock.php index 51ee0241..9c3bcf69 100644 --- a/includes/api/ApiUnblock.php +++ b/includes/api/ApiUnblock.php @@ -153,6 +153,6 @@ class ApiUnblock extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiUnblock.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php index c2aa2a00..2be70108 100644 --- a/includes/api/ApiUndelete.php +++ b/includes/api/ApiUndelete.php @@ -164,6 +164,6 @@ class ApiUndelete extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiUndelete.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php index 1dab0310..e9598378 100644 --- a/includes/api/ApiUpload.php +++ b/includes/api/ApiUpload.php @@ -566,6 +566,6 @@ class ApiUpload extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiUpload.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiUserrights.php b/includes/api/ApiUserrights.php index 93d4ef25..74948ce0 100644 --- a/includes/api/ApiUserrights.php +++ b/includes/api/ApiUserrights.php @@ -144,6 +144,6 @@ class ApiUserrights extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiUserrights.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/api/ApiWatch.php b/includes/api/ApiWatch.php index 6fc55905..27846ab7 100644 --- a/includes/api/ApiWatch.php +++ b/includes/api/ApiWatch.php @@ -130,6 +130,6 @@ class ApiWatch extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiWatch.php 104449 2011-11-28 15:52:04Z reedy $'; + return __CLASS__ . ': $Id$'; } } diff --git a/includes/json/Services_JSON.php b/includes/json/Services_JSON.php index 72bd616e..29cc3617 100644 --- a/includes/json/Services_JSON.php +++ b/includes/json/Services_JSON.php @@ -51,7 +51,7 @@ * @author Matt Knapp * @author Brett Stimmerman * @copyright 2005 Michal Migurski -* @version CVS: $Id: Services_JSON.php 95607 2011-08-27 19:28:13Z hashar $ +* @version CVS: $Id$ * @license http://www.opensource.org/licenses/bsd-license.php * @see http://pear.php.net/pepr/pepr-proposal-show.php?id=198 */ diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php index 080da602..5dffd978 100644 --- a/includes/parser/CoreParserFunctions.php +++ b/includes/parser/CoreParserFunctions.php @@ -141,7 +141,11 @@ class CoreParserFunctions { } static function nse( $parser, $part1 = '' ) { - return wfUrlencode( str_replace( ' ', '_', self::ns( $parser, $part1 ) ) ); + $ret = self::ns( $parser, $part1 ); + if ( is_string( $ret ) ) { + $ret = wfUrlencode( str_replace( ' ', '_', $ret ) ); + } + return $ret; } /** diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php index 1caa2c51..db5268d6 100644 --- a/includes/specials/SpecialPasswordReset.php +++ b/includes/specials/SpecialPasswordReset.php @@ -194,18 +194,19 @@ class SpecialPasswordReset extends FormSpecialPage { ? 'passwordreset-emailtext-ip' : 'passwordreset-emailtext-user'; + // Send in the user's language; which should hopefully be the same + $userLanguage = $firstUser->getOption( 'language' ); + $passwords = array(); foreach ( $users as $user ) { $password = $user->randomPassword(); $user->setNewpassword( $password ); $user->saveSettings(); - $passwords[] = wfMessage( 'passwordreset-emailelement', $user->getName(), $password ); + $passwords[] = wfMessage( 'passwordreset-emailelement', $user->getName(), $password + )->inLanguage( $userLanguage )->plain(); // We'll escape the whole thing later } $passwordBlock = implode( "\n\n", $passwords ); - // Send in the user's language; which should hopefully be the same - $userLanguage = $firstUser->getOption( 'language' ); - $body = wfMessage( $msg )->inLanguage( $userLanguage ); $body->params( $username, @@ -270,4 +271,4 @@ class SpecialPasswordReset extends FormSpecialPage { return false; } -} \ No newline at end of file +} -- cgit v1.2.2