Per siebrand and Nikerabbit (tweak for r47535):

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

diff --git a/includes/Setup.php b/includes/Setup.php
index cfb6a73..d450dfd 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -72,8 +72,8 @@ $wgNamespaceProtection[NS_MEDIAWIKI] = 'editinterface';
  * and "File_talk".  The old names "Image" and "Image_talk" are
  * retained as aliases for backwards compatibility.
  */
-$wgNamespaceAliases['Image'] = NS_IMAGE;
-$wgNamespaceAliases['Image_talk'] = NS_IMAGE_TALK;
+$wgNamespaceAliases['Image'] = NS_FILE;
+$wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
 
 /**
  * Initialise $wgLocalFileRepo from backwards-compatible settings
@@ -197,6 +197,10 @@ if($wgMetaNamespace === FALSE) {
 # To determine the user language, use $wgLang->getCode()
 $wgContLanguageCode = $wgLanguageCode;
 
+# Easy to forget to falsify $wgShowIPinHeader for static caches.
+# If file cache or squid cache is on, just disable this (DWIMD).
+if( $wgUseFileCache || $wgUseSquid ) $wgShowIPinHeader = false;
+
 wfProfileOut( $fname.'-misc1' );
 wfProfileIn( $fname.'-memcached' );
 
@@ -209,15 +213,19 @@ wfDebug( 'Main cache: ' . get_class( $wgMemc ) .
        "\nParser cache: " . get_class( $parserMemc ) . "\n" );
 
 wfProfileOut( $fname.'-memcached' );
+
+## Most of the config is out, some might want to run hooks here.
+wfRunHooks( 'SetupAfterCache' );
+
 wfProfileIn( $fname.'-SetupSession' );
 
 # Set default shared prefix
 if( $wgSharedPrefix === false ) $wgSharedPrefix = $wgDBprefix;
 
 if( !$wgCookiePrefix ) {
-       if ( in_array('user', $wgSharedTables) && $wgSharedDB && $wgSharedPrefix ) {
+       if ( $wgSharedDB && $wgSharedPrefix && in_array('user',$wgSharedTables) ) {
                $wgCookiePrefix = $wgSharedDB . '_' . $wgSharedPrefix;
-       } elseif ( in_array('user', $wgSharedTables) && $wgSharedDB ) {
+       } elseif ( $wgSharedDB && in_array('user',$wgSharedTables) ) {
                $wgCookiePrefix = $wgSharedDB;
        } elseif ( $wgDBprefix ) {
                $wgCookiePrefix = $wgDBname . '_' . $wgDBprefix;