Changeset 15197

Timestamp:

06/10/2010 07:37:51 PM (16 years ago)

Author:

wpmuguru

Message:

allow custom content dir in WP 3.0 main site, fixes #13733

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -2126 +2126 @@
         $upload_path = get_option( 'upload_path' );
         $upload_path = trim($upload_path);
-        $main_override = false;
+        $main_override = defined( 'MULTISITE' ) && is_main_site();
         if ( empty($upload_path) ) {
                 $dir = WP_CONTENT_DIR . '/uploads';
@@ -2133 +2133 @@
                 if ( 'wp-content/uploads' == $upload_path ) {
                         $dir = WP_CONTENT_DIR . '/uploads';
-                        $main_override = defined( 'MULTISITE' ) && is_main_site();
                 } elseif ( 0 !== strpos($dir, ABSPATH) ) {
                         // $dir is absolute, $upload_path is (maybe) relative to ABSPATH
@@ -2147 +2146 @@
         }
 
-        if ( defined('UPLOADS') && ( !$main_override || WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
+        if ( defined('UPLOADS') && !$main_override && ( !isset( $switched ) || $switched === false ) ) {
                 $dir = ABSPATH . UPLOADS;
                 $url = trailingslashit( $siteurl ) . UPLOADS;
         }
 
-        if ( is_multisite() && ( !$main_override || WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
+        if ( is_multisite() && !$main_override && ( !isset( $switched ) || $switched === false ) ) {
                 if ( defined( 'BLOGUPLOADDIR' ) )
                         $dir = untrailingslashit(BLOGUPLOADDIR);