<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14429] trunk/wp-includes: use homeurl(), props PeteMall, see #9008</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14429">14429</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-04 00:28:29 +0000 (Tue, 04 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>use homeurl(), props PeteMall, see <a href="http://trac.wordpress.org/ticket/9008">#9008</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludesjstinymcewpmcehelpphp">trunk/wp-includes/js/tinymce/wp-mce-help.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (14428 => 14429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2010-05-03 23:46:42 UTC (rev 14428)
+++ trunk/wp-includes/class-http.php 2010-05-04 00:28:29 UTC (rev 14429)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> $r['ssl'] = $arrURL['scheme'] == 'https' || $arrURL['scheme'] == 'ssl';
</span><span class="cx">
</span><span class="cx"> // Determine if this request is to OUR install of WordPress
</span><del>- $homeURL = parse_url(get_bloginfo('url'));
</del><ins>+ $homeURL = home_url();
</ins><span class="cx"> $r['local'] = $homeURL['host'] == $arrURL['host'] || 'localhost' == $arrURL['host'];
</span><span class="cx"> unset($homeURL);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjstinymcewpmcehelpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/wp-mce-help.php (14428 => 14429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-help.php 2010-05-03 23:46:42 UTC (rev 14428)
+++ trunk/wp-includes/js/tinymce/wp-mce-help.php 2010-05-04 00:28:29 UTC (rev 14429)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> <h2><?php _e('About TinyMCE'); ?></h2>
</span><span class="cx">
</span><span class="cx"> <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> <p><?php _e('Copyright &copy; 2003-2007, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>
</span><span class="cx"> <p><?php _e('For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.') ?></p>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (14428 => 14429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-05-03 23:46:42 UTC (rev 14428)
+++ trunk/wp-includes/link-template.php 2010-05-04 00:28:29 UTC (rev 14429)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! $link )
</span><del>- $link = trailingslashit(get_bloginfo('url')) . "?attachment_id=$id";
</del><ins>+ $link = home_url( "/?attachment_id=$id" );
</ins><span class="cx">
</span><span class="cx"> return apply_filters('attachment_link', $link, $id);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (14428 => 14429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-05-03 23:46:42 UTC (rev 14428)
+++ trunk/wp-includes/post.php 2010-05-04 00:28:29 UTC (rev 14429)
</span><span class="lines">@@ -3130,9 +3130,9 @@
</span><span class="cx"> * @return bool True on success, false on failure.
</span><span class="cx"> */
</span><span class="cx"> function is_local_attachment($url) {
</span><del>- if (strpos($url, get_bloginfo('url')) === false)
</del><ins>+ if (strpos($url, home_url()) === false)
</ins><span class="cx"> return false;
</span><del>- if (strpos($url, get_bloginfo('url') . '/?attachment_id=') !== false)
</del><ins>+ if (strpos($url, home_url('/?attachment_id=')) !== false)
</ins><span class="cx"> return true;
</span><span class="cx"> if ( $id = url_to_postid($url) ) {
</span><span class="cx"> $post = & get_post($id);
</span></span></pre>
</div>
</div>
</body>
</html>