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

Timestamp:

12/15/2009 05:53:51 PM (15 years ago)

Author:

ryan

Message:

Fix upload dir defaults. Props Denis-de-Bernardy. fixes #11276

File:

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

trunk/wp-includes/functions.php

@@ -2036 +2036 @@
     $upload_path = get_option( 'upload_path' );
     $upload_path = trim($upload_path);
-    if ( empty($upload_path) )
+    if ( empty($upload_path) ) {
         $dir = WP_CONTENT_DIR . '/uploads';
-    else
+    } else {
         $dir = $upload_path;
-
-    // $dir is absolute, $path is (maybe) relative to ABSPATH
-    $dir = path_join( ABSPATH, $dir );
+        if ( 'wp-content/uploads' == $upload_path ) {
+            $dir = WP_CONTENT_DIR . '/uploads';
+        } elseif ( 0 !== strpos($dir, ABSPATH) ) {
+            // $dir is absolute, $upload_path is (maybe) relative to ABSPATH
+            $dir = path_join( ABSPATH, $dir );
+        }
+    }
 
     if ( !$url = get_option( 'upload_url_path' ) ) {
-        if ( empty($upload_path) or ( $upload_path == $dir ) )
+        if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
             $url = WP_CONTENT_URL . '/uploads';
         else