Ticket #11276: 11276.diff

wp-includes/version.php

@@ -15 +15 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 12217;
+$wp_db_version = 12290;
 
 /**
  * Holds the TinyMCE version

wp-admin/includes/upgrade.php

@@ -373 +373 @@
         if ( $wp_current_db_version < 10360 )
                 upgrade_280();
 
-        if ( $wp_current_db_version < 11958 )
+        if ( $wp_current_db_version < 12290 )
                 upgrade_290();
 
         maybe_disable_automattic_widgets();
@@ -1028 +1028 @@
                         update_option( 'thread_comments', 0 );
                 }
         }
+
+        if ( $wp_current_db_version < 12290 ) {
+                $upload_path = get_option('upload_path');
+                $upload_path = str_replace(ABSPATH, '', $upload_path);
+                if ( get_option('upload_path') != $upload_path )
+                        update_option('upload_path', $upload_path);
+        }
 }
 
 

wp-admin/includes/schema.php

@@ -198 +198 @@
                 $upload_path = WP_CONTENT_DIR . '/uploads';
         }
 
+        $upload_path = str_replace(ABSPATH, '', $upload_path);
+
         $options = array(
         'siteurl' => $guessurl,
         'blogname' => __('My Blog'),