From 283d0b8836b52df8675216c23307a3c44661aca7 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Fri, 21 Nov 2003 02:43:12 +0000
Subject: [PATCH] Fixed merge error

---
 includes/Setup.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/includes/Setup.php b/includes/Setup.php
index 3d33b47eb6..3079dc5e88 100644
--- 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" );
-- 
2.20.1