From 12de05107e4c8b006bde6ee8916f34eb476d08da Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 13 Jun 2008 17:21:00 +0000
Subject: WP Merge with revision 8075

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-config-sample.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'wp-config-sample.php')

diff --git a/wp-config-sample.php b/wp-config-sample.php
index 57540e5..11a4d30 100644
--- a/wp-config-sample.php
+++ b/wp-config-sample.php
@@ -39,6 +39,7 @@ define( "WP_USE_MULTIPLE_DB", false );
 
 /* That's all, stop editing! Happy blogging. */
 
-define('ABSPATH', dirname(__FILE__).'/');
-require_once(ABSPATH.'wp-settings.php');
+if ( !defined('ABSPATH') )
+	define('ABSPATH', dirname(__FILE__) . '/');
+require_once(ABSPATH . 'wp-settings.php');
 ?>
-- 
cgit