Fixed merge error

diff --git a/includes/Setup.php b/includes/Setup.php
index 3d33b47..3079dc5 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -54,12 +54,6 @@ $wgMemc = new MemCachedClientforWiki();
 if( $wgUseMemCached ) {
        $wgMemc->set_servers( $wgMemCachedServers );
        $wgMemc->set_debug( $wgMemCachedDebug );
-}
-
-if ( $wgUseDynamicDates ) {
-       include_once( "DateFormatter.php" );
-       global $wgDateFormatter;
-       $wgDateFormatter = new DateFormatter;
 
        # Test it to see if it's working
        # This is necessary because otherwise wfMsg would be extremely inefficient
@@ -68,6 +62,7 @@ if ( $wgUseDynamicDates ) {
                $wgUseMemCached = false;
        }
 }
+
 wfProfileOut( "$fname-memcached" );
 wfProfileIn( "$fname-misc" );
 
@@ -83,6 +78,12 @@ if( ! class_exists( $wgLangClass ) ) {
 }
 $wgLang = new $wgLangClass();
 
+if ( $wgUseDynamicDates ) {
+       include_once( "DateFormatter.php" );
+       global $wgDateFormatter;
+       $wgDateFormatter = new DateFormatter;
+}
+
 if( !$wgCommandLineMode ) {
        if( $wgSessionsInMemcached ) {
                include_once( "MemcachedSessions.php" );