update to MediaWiki 1.17.0

1 files changed, 63 insertions, 20 deletions

diff --git a/includes/Setup.php b/includes/Setup.php
index cd9146ab..5d348885 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * Include most things that's need to customize the site
+ *
+ * @file
  */
 
 /**
@@ -29,6 +31,7 @@ if ( !isset( $wgVersion ) ) {
 // Set various default paths sensibly...
 if( $wgScript === false ) $wgScript = "$wgScriptPath/index$wgScriptExtension";
 if( $wgRedirectScript === false ) $wgRedirectScript = "$wgScriptPath/redirect$wgScriptExtension";
+if( $wgLoadScript === false ) $wgLoadScript = "$wgScriptPath/load$wgScriptExtension";
 
 if( $wgArticlePath === false ) {
 	if( $wgUsePathInfo ) {
@@ -39,6 +42,7 @@ if( $wgArticlePath === false ) {
 }
 
 if( $wgStylePath === false ) $wgStylePath = "$wgScriptPath/skins";
+if( $wgLocalStylePath === false ) $wgLocalStylePath = "$wgScriptPath/skins";
 if( $wgStyleDirectory === false) $wgStyleDirectory   = "$IP/skins";
 if( $wgExtensionAssetsPath === false ) $wgExtensionAssetsPath = "$wgScriptPath/extensions";
 
@@ -53,9 +57,32 @@ if( $wgTmpDirectory === false ) $wgTmpDirectory = "{$wgUploadDirectory}/tmp";
 
 if( $wgReadOnlyFile === false ) $wgReadOnlyFile = "{$wgUploadDirectory}/lock_yBgMBwiR";
 if( $wgFileCacheDirectory === false ) $wgFileCacheDirectory = "{$wgUploadDirectory}/cache";
+if( $wgDeletedDirectory === false ) $wgDeletedDirectory = "{$wgUploadDirectory}/deleted";
+
+if( isset( $wgFileStore['deleted']['directory'] ) ) {
+	$wgDeletedDirectory = $wgFileStore['deleted']['directory'];
+}
+
+if( isset($wgFooterIcons["copyright"]) &&
+  isset($wgFooterIcons["copyright"]["copyright"]) &&
+  $wgFooterIcons["copyright"]["copyright"] === array() ) {
+	if ( isset( $wgCopyrightIcon ) && $wgCopyrightIcon ) {
+		$wgFooterIcons["copyright"]["copyright"] = $wgCopyrightIcon;
+	} elseif ( $wgRightsIcon || $wgRightsText ) {
+		$wgFooterIcons["copyright"]["copyright"] = array(
+			"url" => $wgRightsUrl,
+			"src" => $wgRightsIcon,
+			"alt" => $wgRightsText,
+		);
+	} else {
+		unset($wgFooterIcons["copyright"]["copyright"]);
+	}
+}
 
-if ( empty( $wgFileStore['deleted']['directory'] ) ) {
-	$wgFileStore['deleted']['directory'] = "{$wgUploadDirectory}/deleted";
+if( isset($wgFooterIcons["poweredby"]) &&
+  isset($wgFooterIcons["poweredby"]["mediawiki"]) &&
+  $wgFooterIcons["poweredby"]["mediawiki"]["src"] === null ) {
+	$wgFooterIcons["poweredby"]["mediawiki"]["src"] = "$wgStylePath/common/images/poweredby_mediawiki_88x31.png";
 }
 
 /**
@@ -79,16 +106,23 @@ $wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
  * Initialise $wgLocalFileRepo from backwards-compatible settings
  */
 if ( !$wgLocalFileRepo ) {
+	if( isset( $wgFileStore['deleted']['hash'] ) ) {
+		$deletedHashLevel = $wgFileStore['deleted']['hash'];
+	} else {
+		$deletedHashLevel = $wgHashedUploadDirectory ? 3 : 0;
+	}
 	$wgLocalFileRepo = array(
 		'class' => 'LocalRepo',
 		'name' => 'local',
 		'directory' => $wgUploadDirectory,
+		'scriptDirUrl' => $wgScriptPath,
+		'scriptExtension' => $wgScriptExtension,
 		'url' => $wgUploadBaseUrl ? $wgUploadBaseUrl . $wgUploadPath : $wgUploadPath,
 		'hashLevels' => $wgHashedUploadDirectory ? 2 : 0,
 		'thumbScriptUrl' => $wgThumbnailScriptPath,
 		'transformVia404' => !$wgGenerateThumbnailOnParse,
-		'deletedDir' => $wgFileStore['deleted']['directory'],
-		'deletedHashLevels' => $wgFileStore['deleted']['hash']
+		'deletedDir' => $wgDeletedDirectory,
+		'deletedHashLevels' => $deletedHashLevel
 	);
 }
 /**
@@ -157,7 +191,6 @@ require_once( "$IP/includes/Namespace.php" );
 require_once( "$IP/includes/ProxyTools.php" );
 require_once( "$IP/includes/ObjectCache.php" );
 require_once( "$IP/includes/ImageFunctions.php" );
-require_once( "$IP/includes/StubObject.php" );
 wfProfileOut( $fname.'-includes' );
 wfProfileIn( $fname.'-misc1' );
 
@@ -165,7 +198,7 @@ wfProfileIn( $fname.'-misc1' );
 wfMemoryLimit();
 
 /**
- * Set up the timezone, suppressing the pseudo-security warning in PHP 5.1+ 
+ * Set up the timezone, suppressing the pseudo-security warning in PHP 5.1+
  * that happens whenever you use a date function without the timezone being
  * explicitly set. Inspired by phpMyAdmin's treatment of the problem.
  */
@@ -173,16 +206,21 @@ wfSuppressWarnings();
 date_default_timezone_set( date_default_timezone_get() );
 wfRestoreWarnings();
 
-$wgIP = false; # Load on demand
 # Can't stub this one, it sets up $_GET and $_REQUEST in its constructor
 $wgRequest = new WebRequest;
 
 # Useful debug output
+global $wgCommandLineMode;
 if ( $wgCommandLineMode ) {
 	wfDebug( "\n\nStart command line script $self\n" );
 } else {
 	wfDebug( "Start request\n\n" );
-	wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
+	# Output the REQUEST_URI. This is not supported by IIS in rewrite mode,
+	# so use an alternative
+	$requestUri = isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] :
+		( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ? $_SERVER['HTTP_X_ORIGINAL_URL'] :
+		$_SERVER['PHP_SELF'] );
+	wfDebug( "{$_SERVER['REQUEST_METHOD']} {$requestUri}\n" );
 
 	if ( $wgDebugPrintHttpHeaders ) {
 		$headerOut = "HTTP HEADERS:\n";
@@ -251,6 +289,12 @@ if ( !$wgHtml5Version && $wgHtml5 && $wgAllowRdfaAttributes ) {
 	else $wgHtml5Version = 'HTML+RDFa 1.0';
 }
 
+if ( $wgInvalidateCacheOnLocalSettingsChange ) {
+	$wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( "$IP/LocalSettings.php" ) ) );
+}
+
+# Blacklisted file extensions shouldn't appear on the "allowed" list
+$wgFileExtensions = array_diff ( $wgFileExtensions, $wgFileBlacklist );
 
 wfProfileOut( $fname.'-misc1' );
 wfProfileIn( $fname.'-memcached' );
@@ -291,13 +335,15 @@ $wgCookiePrefix = strtr($wgCookiePrefix, "=,; +.\"'\\[", "__________");
 if( !wfIniGetBool( 'session.auto_start' ) )
 	session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix . '_session' );
 
-if( !$wgCommandLineMode && ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) {
-	wfIncrStats( 'request_with_session' );
-	wfSetupSession();
-	$wgSessionStarted = true;
-} else {
-	wfIncrStats( 'request_without_session' );
-	$wgSessionStarted = false;
+if( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
+	if( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) {
+		wfIncrStats( 'request_with_session' );
+		wfSetupSession();
+		$wgSessionStarted = true;
+	} else {
+		wfIncrStats( 'request_without_session' );
+		$wgSessionStarted = false;
+	}
 }
 
 wfProfileOut( $fname.'-SetupSession' );
@@ -307,14 +353,13 @@ $wgContLang = new StubContLang;
 
 // Now that variant lists may be available...
 $wgRequest->interpolateTitle();
-
-$wgUser = new StubUser;
+$wgUser = $wgCommandLineMode ? new User : User::newFromSession();
 $wgLang = new StubUserLang;
 $wgOut = new StubObject( 'wgOut', 'OutputPage' );
 $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) );
 
 $wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache',
-	array( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, wfWikiID() ) );
+	array( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry ) );
 
 wfProfileOut( $fname.'-globals' );
 wfProfileIn( $fname.'-User' );
@@ -337,9 +382,7 @@ wfProfileOut( $fname.'-User' );
 wfProfileIn( $fname.'-misc2' );
 
 $wgDeferredUpdateList = array();
-$wgPostCommitUpdateList = array();
 
-if ( $wgAjaxWatch ) $wgAjaxExportList[] = 'wfAjaxWatch';
 if ( $wgAjaxUploadDestCheck ) $wgAjaxExportList[] = 'SpecialUpload::ajaxGetExistsWarning';
 
 # Placeholders in case of DB error