Changeset 13619 for trunk/wp-includes/functions.php

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

File:

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

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;