Ticket #2271: 2271.diff

wp-includes/functions-post.php

@@ -877 +877 @@
 // Returns an array containing the current upload directory's path and url, or an error message.
 function wp_upload_dir() {
         $siteurl = get_settings('siteurl');
-        //prepend ABSPATH to $dir and $siteurl to $url if they're not already there
+        //prepend ABSPATH to $dir if it's not already there
         $dir = ABSPATH . str_replace(ABSPATH, '', trim(get_settings('fileupload_realpath')));
-        $url = $siteurl . str_replace($siteurl, '', trim(get_settings('fileupload_url')));
 
         if ( $dir == ABSPATH ) { //the option was empty
                 $dir = ABSPATH . 'wp-content/uploads';
         }
-        if ( $url == $siteurl ) { //the option was empty
-                $url = get_option('siteurl') . '/' . str_replace(ABSPATH, '', $dir);
-        }
-
+        
+        $url = get_option('siteurl') . '/' . str_replace(ABSPATH, '', $dir);
+        
         if ( defined('UPLOADS') ) {
                 $dir = ABSPATH . UPLOADS;
                 $url =  get_option('siteurl') . '/' . UPLOADS;

wp-admin/upgrade-schema.php

@@ -223 +223 @@
         // 2.1
         add_option('uploads_use_yearmonth_folders', 1);
         add_option('fileupload_realpath', ABSPATH . 'wp-content/uploads');
-        add_option('fileupload_url', ''); //if this is empty it will be obtained from fileupload_realpath
         
         // Delete unused options
         $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog');