Changeset 23002

Timestamp:

12/03/2012 10:24:06 PM (13 years ago)

Author:

ryan

Message:

Properly set the base URL for the main site when ms-files rewriting is enabled for MU-era installs.

Props nacin
fixes #22702

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -1538 +1538 @@
             //   2) we are not switched, as ms_upload_constants() hardcodes
             //      these constants to reflect the original blog ID.
+            //
+            // Rather than UPLOADS, we actually use BLOGUPLOADDIR if it is set, as it is absolute.
+            // (And it will be set, see ms_upload_constants().) Otherwise, UPLOADS can be used, as
+            // as it is relative to ABSPATH. For the final piece: when UPLOADS is used with ms-files
+            // rewriting in multisite, the resulting URL is /files. (#WP22702 for background.)
 
             if ( defined( 'BLOGUPLOADDIR' ) )
                 $dir = untrailingslashit( BLOGUPLOADDIR );
-            $url = str_replace( untrailingslashit( UPLOADS ), 'files', $url );
+            else
+                $dir = ABSPATH . UPLOADS;
+            $url = trailingslashit( $siteurl ) . 'files';
         }
     }