Changeset 14429

Timestamp:

05/04/2010 12:28:29 AM (15 years ago)

Author:

wpmuguru

Message:

use homeurl(), props PeteMall, see #9008

Location:

trunk/wp-includes

Files:

• class-http.php (modified) (1 diff)
• js/tinymce/wp-mce-help.php (modified) (1 diff)
• link-template.php (modified) (1 diff)
• post.php (modified) (1 diff)

trunk/wp-includes/class-http.php

@@ -252 +252 @@
 
         // 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);

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

@@ -241 +241 @@
 
     <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>

trunk/wp-includes/link-template.php

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

trunk/wp-includes/post.php

@@ -3131 +3131 @@
  */
 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) ) {