check that $wgArticle is an instance of the Article class in Skin::pageStats() per...

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

diff --git a/includes/Setup.php b/includes/Setup.php
index 506c370..859ad00 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -209,15 +209,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;