summaryrefslogtreecommitdiffstats
path: root/wp-settings.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-11-28 12:05:29 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-11-28 12:05:29 +0000
commit475ef251608d4d8a4d44a86d99693c416a1159fd (patch)
tree3cbc81538ad73bcd44d232607acebec3a98d1084 /wp-settings.php
parent8137c6491051a8bdc77e8559f4924307e8e2f1c7 (diff)
downloadwordpress-mu-475ef251608d4d8a4d44a86d99693c416a1159fd.tar.gz
wordpress-mu-475ef251608d4d8a4d44a86d99693c416a1159fd.tar.xz
wordpress-mu-475ef251608d4d8a4d44a86d99693c416a1159fd.zip
Needed to rename this CONSTANT for a long time
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@815 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
-rw-r--r--wp-settings.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/wp-settings.php b/wp-settings.php
index a777789..021c082 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -147,8 +147,9 @@ else
wp_cache_init();
-define( "UPLOADS", "wp-content/blogs.dir/{$wpdb->blogid}/files/" );
-if( defined( "BLOGDEFINITION" ) && constant( "BLOGDEFINITION" ) == true )
+if( !defined( "UPLOADS" ) )
+ define( "UPLOADS", "wp-content/blogs.dir/{$wpdb->blogid}/files/" );
+if( defined( "SHORTINIT" ) && constant( "SHORTINIT" ) == true ) // stop most of WP being loaded, we just want the basics
return;