http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96141
Revision: 96141
Author: robin
Date: 2011-09-02 19:20:40 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Drop support for 1.17 and below, as version_compare() doesn't work properly and
1.18 will be deployed to wmf wikis soon anyway.
Modified Paths:
--------------
trunk/extensions/WikimediaIncubator/IncubatorTest.php
trunk/extensions/WikimediaIncubator/SpecialRandomByTest.php
trunk/extensions/WikimediaIncubator/WikimediaIncubator.php
Modified: trunk/extensions/WikimediaIncubator/IncubatorTest.php
===================================================================
--- trunk/extensions/WikimediaIncubator/IncubatorTest.php 2011-09-02
18:45:49 UTC (rev 96140)
+++ trunk/extensions/WikimediaIncubator/IncubatorTest.php 2011-09-02
19:20:40 UTC (rev 96141)
@@ -382,12 +382,9 @@
* @return Array with language names
*/
static public function getLanguageNames( $code = null ) {
- if ( is_callable( array( 'Language',
'getTranslatedLanguageNames' ) ) ) {
- global $wgLang;
- $langcode = ( $code ? $code : $wgLang->getCode() );
- return Language::getTranslatedLanguageNames( $langcode
);
- }
- return Language::getLanguageNames( false );
+ global $wgLang;
+ $langcode = ( $code ? $code : $wgLang->getCode() );
+ return Language::getTranslatedLanguageNames( $langcode );
}
/**
Modified: trunk/extensions/WikimediaIncubator/SpecialRandomByTest.php
===================================================================
--- trunk/extensions/WikimediaIncubator/SpecialRandomByTest.php 2011-09-02
18:45:49 UTC (rev 96140)
+++ trunk/extensions/WikimediaIncubator/SpecialRandomByTest.php 2011-09-02
19:20:40 UTC (rev 96141)
@@ -20,12 +20,8 @@
$this->extra[] = 'page_title' .
$dbr->buildLike( IncubatorTest::displayPrefix(
$project, $lang ) . '/', $dbr->anyString() );
} elseif( $wgUser->getOption($wmincPref . '-project') ==
$wmincProjectSite['short'] ) {
- global $wgVersion;
- # only works above MW 1.17
- if( version_compare($wgVersion, '1.17', '>') ) {
- # project or help namespace
- $this->extra['page_namespace'] = array( 4, 12 );
- }
+ # project or help namespace
+ $this->extra['page_namespace'] = array( 4, 12 );
}
parent::__construct( 'RandomByTest' );
}
Modified: trunk/extensions/WikimediaIncubator/WikimediaIncubator.php
===================================================================
--- trunk/extensions/WikimediaIncubator/WikimediaIncubator.php 2011-09-02
18:45:49 UTC (rev 96140)
+++ trunk/extensions/WikimediaIncubator/WikimediaIncubator.php 2011-09-02
19:20:40 UTC (rev 96141)
@@ -5,6 +5,8 @@
* for a test wiki system (i.e. incubated wikis inside one actual wiki)
* mainly intended for the Wikimedia Incubator
*
+ * MediaWiki 1.18 or higher required
+ *
* @file
* @ingroup Extensions
* @author Robin Pepermans (SPQRobin)
@@ -143,9 +145,7 @@
$wgHooks['PageContentLanguage'][] = 'IncubatorTest::onPageContentLanguage';
/* List of users */
-if( version_compare( $wgVersion, '1.17', '>' ) ) { # doesn't work below 1.18
- $wgAutoloadClasses['ListUsersTestWiki'] = $dir .
'ListUsersTestWiki.php';
- $wgHooks['SpecialListusersHeaderForm'][] =
'ListUsersTestWiki::onSpecialListusersHeaderForm';
- $wgHooks['SpecialListusersQueryInfo'][] =
'ListUsersTestWiki::onSpecialListusersQueryInfo';
- $wgHooks['SpecialListusersHeader'][] =
'ListUsersTestWiki::onSpecialListusersHeader';
-}
\ No newline at end of file
+$wgAutoloadClasses['ListUsersTestWiki'] = $dir . 'ListUsersTestWiki.php';
+$wgHooks['SpecialListusersHeaderForm'][] =
'ListUsersTestWiki::onSpecialListusersHeaderForm';
+$wgHooks['SpecialListusersQueryInfo'][] =
'ListUsersTestWiki::onSpecialListusersQueryInfo';
+$wgHooks['SpecialListusersHeader'][] =
'ListUsersTestWiki::onSpecialListusersHeader';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
