Changeset 12405

Timestamp:

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

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (2 diffs)
• wp-admin/options-misc.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -190 +190 @@
 
     if ( ini_get('safe_mode') ) {
-        // Safe mode screws up mkdir(), so we must use a flat structure.
+        // Safe mode can break mkdir() so use a flat structure by default.
         $uploads_use_yearmonth_folders = 0;
-        $upload_path = WP_CONTENT_DIR;
     } else {
         $uploads_use_yearmonth_folders = 1;
-        $upload_path = WP_CONTENT_DIR . '/uploads';
     }
 
@@ -266 +264 @@
     // 2.0.1
     'uploads_use_yearmonth_folders' => $uploads_use_yearmonth_folders,
-    'upload_path' => $upload_path,
+    'upload_path' => '',
 
     // 2.0.3

trunk/wp-admin/options-misc.php

@@ -31 +31 @@
 <tr valign="top">
 <th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
-<td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(str_replace(ABSPATH, '', get_option('upload_path'))); ?>" class="regular-text code" />
+<td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
 <span class="description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></span>
 </td>

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