Changes in trunk/wp-includes/functions.php [15197:14854]

File:

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

trunk/wp-includes/functions.php

@@ -1286 +1286 @@
     fwrite( $out_fp,  $response['body']);
     fclose($out_fp);
-    clearstatcache();
 
     return $headers;
@@ -2126 +2125 @@
     $upload_path = get_option( 'upload_path' );
     $upload_path = trim($upload_path);
-    $main_override = defined( 'MULTISITE' ) && is_main_site();
+    $main_override = false;
     if ( empty($upload_path) ) {
         $dir = WP_CONTENT_DIR . '/uploads';
@@ -2133 +2132 @@
         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
@@ -2146 +2146 @@
     }
 
-    if ( defined('UPLOADS') && !$main_override && ( !isset( $switched ) || $switched === false ) ) {
+    if ( defined('UPLOADS') && ( !$main_override || WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
         $dir = ABSPATH . UPLOADS;
         $url = trailingslashit( $siteurl ) . UPLOADS;
     }
 
-    if ( is_multisite() && !$main_override && ( !isset( $switched ) || $switched === false ) ) {
+    if ( is_multisite() && ( !$main_override || WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
         if ( defined( 'BLOGUPLOADDIR' ) )
             $dir = untrailingslashit(BLOGUPLOADDIR);
@@ -2305 +2305 @@
     @fwrite( $ifp, $bits );
     fclose( $ifp );
-    clearstatcache();
-
     // Set correct file permissions
     $stat = @ stat( dirname( $new_file ) );
@@ -2312 +2310 @@
     $perms = $perms & 0000666;
     @ chmod( $new_file, $perms );
-    clearstatcache();
 
     // Compute the URL