http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97491
Revision: 97491
Author: reedy
Date: 2011-09-19 13:47:15 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Fix assingment in conditionals
Remove unused globals/variables
Modified Paths:
--------------
trunk/extensions/CategoryBrowser/CategoryBrowser.php
trunk/extensions/ExtensionManagement/specials/SpecialExtensionManagement.php
trunk/phase3/languages/Language.php
Modified: trunk/extensions/CategoryBrowser/CategoryBrowser.php
===================================================================
--- trunk/extensions/CategoryBrowser/CategoryBrowser.php 2011-09-19
13:45:46 UTC (rev 97490)
+++ trunk/extensions/CategoryBrowser/CategoryBrowser.php 2011-09-19
13:47:15 UTC (rev 97491)
@@ -56,7 +56,7 @@
$wgExtensionAliasesFiles['CategoryBrowser'] = $dir .
'/CategoryBrowser.alias.php';
$wgSpecialPages['CategoryBrowser'] = 'CategoryBrowserPage';
$wgSpecialPageGroups['CategoryBrowser'] = 'pages';
-
+
CB_Setup::init();
class CB_Setup {
@@ -95,11 +95,7 @@
*/
static function init() {
global $wgScriptPath;
- global $wgExtensionMessagesFiles;
global $wgAutoloadClasses;
- global $wgExtensionCredits;
- global $wgSpecialPages;
- global $wgSpecialPageGroups;
global $wgAjaxExportList;
self::$ExtDir = str_replace( "\\", "/", dirname( __FILE__ ) );
Modified:
trunk/extensions/ExtensionManagement/specials/SpecialExtensionManagement.php
===================================================================
---
trunk/extensions/ExtensionManagement/specials/SpecialExtensionManagement.php
2011-09-19 13:45:46 UTC (rev 97490)
+++
trunk/extensions/ExtensionManagement/specials/SpecialExtensionManagement.php
2011-09-19 13:47:15 UTC (rev 97491)
@@ -15,7 +15,7 @@
static $viewvcUrls = array(
'svn+ssh://svn.wikimedia.org/svnroot/mediawiki' =>
'http://svn.wikimedia.org/viewvc/mediawiki',
'http://svn.wikimedia.org/svnroot/mediawiki' =>
'http://svn.wikimedia.org/viewvc/mediawiki',
- # Doesn't work at the time of writing but maybe some day:
+ # Doesn't work at the time of writing but maybe some day:
'https://svn.wikimedia.org/viewvc/mediawiki' =>
'http://svn.wikimedia.org/viewvc/mediawiki',
);
@@ -43,10 +43,8 @@
function displayExtensions() {
- global $wgOut, $wgExtensionCredits;
+ global $wgExtensionCredits;
- $extensionAmount = 0;
-
$extensionTypes = array(
'specialpage' => wfMsg( 'version-specialpages' ),
'parserhook' => wfMsg( 'version-parserhooks' ),
@@ -125,8 +123,8 @@
}
# Version
if ( isset( $extension['version'] ) ) {
- $versionText = '<span
class="mw-version-ext-version"><em>' .
- wfMsg( 'version-version', $extension['version']
) .
+ $versionText = '<span
class="mw-version-ext-version"><em>' .
+ wfMsg( 'version-version', $extension['version']
) .
'</em></span> | ';
} else {
$versionText = '';
@@ -203,7 +201,7 @@
} else {
if( is_object( $list[0] ) )
$class = get_class( $list[0] );
- else
+ else
$class = $list[0];
return "($class, {$list[1]})";
}
Modified: trunk/phase3/languages/Language.php
===================================================================
--- trunk/phase3/languages/Language.php 2011-09-19 13:45:46 UTC (rev 97490)
+++ trunk/phase3/languages/Language.php 2011-09-19 13:47:15 UTC (rev 97491)
@@ -514,7 +514,6 @@
return $this->mNamespaceIds;
}
-
/**
* Get a namespace key by value, case insensitive. Canonical namespace
* names override custom ones defined for the current language.
@@ -524,7 +523,8 @@
*/
function getNsIndex( $text ) {
$lctext = $this->lc( $text );
- if ( ( $ns = MWNamespace::getCanonicalIndex( $lctext ) ) !==
null ) {
+ $ns = MWNamespace::getCanonicalIndex( $lctext );
+ if ( $ns !== null ) {
return $ns;
}
$ids = $this->getNamespaceIds();
@@ -543,7 +543,9 @@
list( $rootCode ) = explode( '-', $code );
if( $usemsg && wfMessage( $msg )->exists() ) {
return $this->getMessageFromDB( $msg );
- } elseif( $name = self::getLanguageName( $code ) ) {
+ }
+ $name = self::getLanguageName( $code );
+ if( $name ) {
return $name; # if it's defined as a language name,
show that
} else {
# otherwise, output the language code
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
