Ticket #12549: 12549.diff

File 12549.diff, 1.6 KB (added by wpmuguru, 3 years ago)
Line 
1Index: wp-includes/functions.php
2===================================================================
3--- wp-includes/functions.php   (revision 14606)
4+++ wp-includes/functions.php   (working copy)
5@@ -2117,12 +2117,14 @@
6        $siteurl = get_option( 'siteurl' );
7        $upload_path = get_option( 'upload_path' );
8        $upload_path = trim($upload_path);
9+       $main_override = false;
10        if ( empty($upload_path) ) {
11                $dir = WP_CONTENT_DIR . '/uploads';
12        } else {
13                $dir = $upload_path;
14                if ( 'wp-content/uploads' == $upload_path ) {
15                        $dir = WP_CONTENT_DIR . '/uploads';
16+                       $main_override = defined( 'MULTISITE' );
17                } elseif ( 0 !== strpos($dir, ABSPATH) ) {
18                        // $dir is absolute, $upload_path is (maybe) relative to ABSPATH
19                        $dir = path_join( ABSPATH, $dir );
20@@ -2136,12 +2138,12 @@
21                        $url = trailingslashit( $siteurl ) . $upload_path;
22        }
23 
24-       if ( defined('UPLOADS') && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
25+       if ( defined('UPLOADS') && ( !$main_override || WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
26                $dir = ABSPATH . UPLOADS;
27                $url = trailingslashit( $siteurl ) . UPLOADS;
28        }
29 
30-       if ( is_multisite() && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
31+       if ( is_multisite() && ( !$main_override || WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
32                if ( defined( 'BLOGUPLOADDIR' ) )
33                        $dir = untrailingslashit(BLOGUPLOADDIR);
34                $url = str_replace( UPLOADS, 'files', $url );