r52070 breaks the use of optgroups etc: array(...) is cast to 'Array'. Need to only...

[lhc/web/wiklou.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 8e59c2a..d28b339 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -63,6 +63,28 @@ 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( isset($wgFooterIcons["poweredby"]) &&
+  isset($wgFooterIcons["poweredby"]["mediawiki"]) &&
+  $wgFooterIcons["poweredby"]["mediawiki"]["src"] === null ) {
+       $wgFooterIcons["poweredby"]["mediawiki"]["src"] = "$wgStylePath/common/images/poweredby_mediawiki_88x31.png";
+}
+
 /**
  * Unconditional protection for NS_MEDIAWIKI since otherwise it's too easy for a
  * sysadmin to set $wgNamespaceProtection incorrectly and leave the wiki insecure.
@@ -195,9 +217,14 @@ if ( $wgCommandLineMode ) {
        wfDebug( "Start request\n\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'] );
+       if ( isset( $_SERVER['REQUEST_URI'] ) ) {
+               $requestUri = $_SERVER['REQUEST_URI'];
+       } elseif ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
+               $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL'];
+       } else {
+               $requestUri = $_SERVER['PHP_SELF'];
+       }
+
        wfDebug( "{$_SERVER['REQUEST_METHOD']} {$requestUri}\n" );
 
        if ( $wgDebugPrintHttpHeaders ) {
@@ -267,6 +294,9 @@ if ( !$wgHtml5Version && $wgHtml5 && $wgAllowRdfaAttributes ) {
        else $wgHtml5Version = 'HTML+RDFa 1.0';
 }
 
+if ( $wgInvalidateCacheOnLocalSettingsChange ) {
+       $wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( "$IP/LocalSettings.php" ) ) );
+}
 
 wfProfileOut( $fname.'-misc1' );
 wfProfileIn( $fname.'-memcached' );
@@ -307,8 +337,8 @@ $wgCookiePrefix = strtr($wgCookiePrefix, "=,; +.\"'\\[", "__________");
 if( !wfIniGetBool( 'session.auto_start' ) )
        session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix . '_session' );
 
-if( !defined( 'MW_NO_SESSION' ) ) {
-       if( !$wgCommandLineMode && ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) {
+if( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
+       if( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) {
                wfIncrStats( 'request_with_session' );
                wfSetupSession();
                $wgSessionStarted = true;
@@ -354,7 +384,6 @@ wfProfileOut( $fname.'-User' );
 wfProfileIn( $fname.'-misc2' );
 
 $wgDeferredUpdateList = array();
-$wgPostCommitUpdateList = array();
 
 if ( $wgAjaxUploadDestCheck ) $wgAjaxExportList[] = 'SpecialUpload::ajaxGetExistsWarning';