http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72834
Revision: 72834
Author: platonides
Date: 2010-09-11 21:55:21 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
Code cleanup: unused globals, empty statements, typos...
Modified Paths:
--------------
trunk/phase3/includes/OutputPage.php
trunk/phase3/includes/ResourceLoaderModule.php
trunk/phase3/includes/Skin.php
trunk/phase3/includes/installer/DatabaseUpdater.php
trunk/phase3/includes/media/PNG.php
trunk/phase3/includes/parser/DateFormatter.php
trunk/phase3/includes/parser/Preprocessor_Hash.php
trunk/phase3/includes/specials/SpecialUserlogin.php
Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php 2010-09-11 21:30:22 UTC (rev
72833)
+++ trunk/phase3/includes/OutputPage.php 2010-09-11 21:55:21 UTC (rev
72834)
@@ -2332,7 +2332,7 @@
* @return String: HTML fragment
*/
function getHeadScripts( Skin $sk ) {
- global $wgUser, $wgRequest, $wgJsMimeType;
+ global $wgUser, $wgRequest;
global $wgUseSiteJs;
// Statup - this will immediately load jquery and mediawiki
modules
Modified: trunk/phase3/includes/ResourceLoaderModule.php
===================================================================
--- trunk/phase3/includes/ResourceLoaderModule.php 2010-09-11 21:30:22 UTC
(rev 72833)
+++ trunk/phase3/includes/ResourceLoaderModule.php 2010-09-11 21:55:21 UTC
(rev 72834)
@@ -903,7 +903,7 @@
protected function getConfig( $context ) {
global $wgLoadScript, $wgScript, $wgStylePath,
$wgScriptExtension, $wgArticlePath, $wgScriptPath, $wgServer,
- $wgContLang, $wgBreakFrames, $wgVariantArticlePath,
$wgActionPaths, $wgUseAjax, $wgAjaxWatch, $wgVersion,
+ $wgContLang, $wgBreakFrames, $wgVariantArticlePath,
$wgActionPaths, $wgUseAjax, $wgVersion,
$wgEnableAPI, $wgEnableWriteAPI, $wgDBname,
$wgEnableMWSuggest, $wgSitename, $wgFileExtensions;
// Pre-process information
@@ -963,7 +963,7 @@
/* Methods */
public function getScript( ResourceLoaderContext $context ) {
- global $IP, $wgStylePath, $wgLoadScript;
+ global $IP, $wgLoadScript;
$scripts = file_get_contents( "$IP/resources/startup.js" );
Modified: trunk/phase3/includes/Skin.php
===================================================================
--- trunk/phase3/includes/Skin.php 2010-09-11 21:30:22 UTC (rev 72833)
+++ trunk/phase3/includes/Skin.php 2010-09-11 21:55:21 UTC (rev 72834)
@@ -481,7 +481,7 @@
* @private
*/
function setupUserCss( OutputPage $out ) {
- global $wgRequest, $wgUser;
+ global $wgRequest;
global $wgUseSiteCss, $wgAllowUserCss, $wgAllowUserCssPrefs,
$wgSquidMaxage;
wfProfileIn( __METHOD__ );
Modified: trunk/phase3/includes/installer/DatabaseUpdater.php
===================================================================
--- trunk/phase3/includes/installer/DatabaseUpdater.php 2010-09-11 21:30:22 UTC
(rev 72833)
+++ trunk/phase3/includes/installer/DatabaseUpdater.php 2010-09-11 21:55:21 UTC
(rev 72834)
@@ -237,7 +237,7 @@
/**
* Get an array of updates to perform on the database. Should return a
- * mutli-dimensional array. The main key is the MediaWiki version (1.12,
+ * multi-dimensional array. The main key is the MediaWiki version (1.12,
* 1.13...) with the values being arrays of updates, identical to how
* updaters.inc did it (for now)
*
Modified: trunk/phase3/includes/media/PNG.php
===================================================================
--- trunk/phase3/includes/media/PNG.php 2010-09-11 21:30:22 UTC (rev 72833)
+++ trunk/phase3/includes/media/PNG.php 2010-09-11 21:55:21 UTC (rev 72834)
@@ -68,7 +68,7 @@
if ($metadata['loopCount'] == 0)
$info[] = wfMsgExt( 'file-info-png-looped',
'parseinline' );
elseif ($metadata['loopCount'] > 1)
- $info[] = wfMsgExt( 'file-info-png-repeat',
'parseinline', $metadata['loopCount'] );;
+ $info[] = wfMsgExt( 'file-info-png-repeat',
'parseinline', $metadata['loopCount'] );
if ($metadata['frameCount'] > 0)
$info[] = wfMsgExt( 'file-info-png-frames',
'parseinline', $metadata['frameCount'] );
Modified: trunk/phase3/includes/parser/DateFormatter.php
===================================================================
--- trunk/phase3/includes/parser/DateFormatter.php 2010-09-11 21:30:22 UTC
(rev 72833)
+++ trunk/phase3/includes/parser/DateFormatter.php 2010-09-11 21:55:21 UTC
(rev 72834)
@@ -271,7 +271,7 @@
$isoBits[] = $bits['y'];
$isoBits[] = $bits['m'];
$isoBits[] = $bits['d'];
- $isoDate = implode( '-', $isoBits );;
+ $isoDate = implode( '-', $isoBits );
// Output is not strictly HTML (it's wikitext), but <span> is
whitelisted.
$text = Html::rawElement( 'span',
Modified: trunk/phase3/includes/parser/Preprocessor_Hash.php
===================================================================
--- trunk/phase3/includes/parser/Preprocessor_Hash.php 2010-09-11 21:30:22 UTC
(rev 72833)
+++ trunk/phase3/includes/parser/Preprocessor_Hash.php 2010-09-11 21:55:21 UTC
(rev 72834)
@@ -680,7 +680,7 @@
// Cache
if ($cacheable) {
- $cacheValue = sprintf( "%08d", self::CACHE_VERSION ) .
serialize( $rootNode );;
+ $cacheValue = sprintf( "%08d", self::CACHE_VERSION ) .
serialize( $rootNode );
$wgMemc->set( $cacheKey, $cacheValue, 86400 );
wfProfileOut( __METHOD__.'-cache-miss' );
wfProfileOut( __METHOD__.'-cacheable' );
Modified: trunk/phase3/includes/specials/SpecialUserlogin.php
===================================================================
--- trunk/phase3/includes/specials/SpecialUserlogin.php 2010-09-11 21:30:22 UTC
(rev 72833)
+++ trunk/phase3/includes/specials/SpecialUserlogin.php 2010-09-11 21:55:21 UTC
(rev 72834)
@@ -272,7 +272,7 @@
# Request forgery checks.
if ( !self::getCreateaccountToken() ) {
self::setCreateaccountToken();
- $this->mainLoginForm( wfMsgExt( 'nocookiesnew', array(
'parseinline' ) ) );;
+ $this->mainLoginForm( wfMsgExt( 'nocookiesnew', array(
'parseinline' ) ) );
return false;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
