Ticket #9008: 9008.4.diff

wp-includes/class-http.php

@@ -251 +251 @@
                 $r['ssl'] = $arrURL['scheme'] == 'https' || $arrURL['scheme'] == 'ssl';
 
                 // Determine if this request is to OUR install of WordPress
-                $homeURL = parse_url(get_bloginfo('url'));
+                $homeURL = home_url();
                 $r['local'] = $homeURL['host'] == $arrURL['host'] || 'localhost' == $arrURL['host'];
                 unset($homeURL);
 

wp-includes/post.php

@@ -3130 +3130 @@
  * @return bool True on success, false on failure.
  */
 function is_local_attachment($url) {
-        if (strpos($url, get_bloginfo('url')) === false)
+        if (strpos($url, home_url()) === false)
                 return false;
-        if (strpos($url, get_bloginfo('url') . '/?attachment_id=') !== false)
+        if (strpos($url, home_url('/?attachment_id=')) !== false)
                 return true;
         if ( $id = url_to_postid($url) ) {
                 $post = & get_post($id);

wp-includes/js/tinymce/wp-mce-help.php

@@ -240 +240 @@
         <h2><?php _e('About TinyMCE'); ?></h2>
 
     <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
-        <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.get_bloginfo('url').'/wp-includes/js/tinymce/license.txt" target="_blank" title="'.__('GNU Library General Public Licence').'">') ?></p>
+        <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.home_url('/wp-includes/js/tinymce/license.txt').'" target="_blank" title="'.__('GNU Library General Public Licence').'">') ?></p>
         <p><?php _e('Copyright &copy; 2003-2007, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>
         <p><?php _e('For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.') ?></p>
 

wp-includes/link-template.php

@@ -321 +321 @@
         }
 
         if ( ! $link )
-                $link = trailingslashit(get_bloginfo('url')) . "?attachment_id=$id";
+                $link = home_url( "/?attachment_id=$id" );
 
         return apply_filters('attachment_link', $link, $id);
 }