Changeset 13619

Timestamp:

03/08/2010 07:52:29 PM (16 years ago)

Author:

wpmuguru

Message:

allow existing media path on main site when converting to multisite, see #12549

Location:

trunk

Files:

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

trunk/wp-admin/includes/schema.php

@@ -727 +727 @@
         update_user_meta( $site_user->ID, 'source_domain', $domain );
         update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
+        if ( !$upload_path = get_option( 'upload_path' ) ) {
+            $upload_path = substr( WP_CONTENT_DIR, strlen( ABSPATH ) ) . '/uploads';
+            update_option( 'upload_path', $upload_path );
+        }
     }
 

trunk/wp-includes/functions.php

@@ -2132 +2132 @@
     }
 
-    if ( defined('UPLOADS') ) {
+    if ( defined('UPLOADS') && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) ) {
         $dir = ABSPATH . UPLOADS;
         $url = trailingslashit( $siteurl ) . UPLOADS;