<!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>[15378] branches/3.0/wp-includes:
More judicious Wordpress-to-WordPress correction,
to avoid bungling reasonable URLs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15378">15378</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-07-08 19:43:04 +0000 (Thu, 08 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More judicious Wordpress-to-WordPress correction, to avoid bungling reasonable URLs. fixes <a href="http://trac.wordpress.org/ticket/13971">#13971</a> for 3.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30wpincludesdefaultfiltersphp">branches/3.0/wp-includes/default-filters.php</a></li>
<li><a href="#branches30wpincludesformattingphp">branches/3.0/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30wpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-includes/default-filters.php (15377 => 15378)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-includes/default-filters.php 2010-07-08 19:35:29 UTC (rev 15377)
+++ branches/3.0/wp-includes/default-filters.php 2010-07-08 19:43:04 UTC (rev 15378)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> // Format WordPress
</span><span class="cx"> foreach ( array( 'the_content', 'the_title', 'comment_text' ) as $filter )
</span><del>- add_filter( $filter, 'capital_P_dangit' );
</del><ins>+ add_filter( $filter, 'capital_P_dangit', 11 );
</ins><span class="cx">
</span><span class="cx"> // Format titles
</span><span class="cx"> foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description' ) as $filter ) {
</span></span></pre></div>
<a id="branches30wpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-includes/formatting.php (15377 => 15378)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-includes/formatting.php 2010-07-08 19:35:29 UTC (rev 15377)
+++ branches/3.0/wp-includes/formatting.php 2010-07-08 19:43:04 UTC (rev 15378)
</span><span class="lines">@@ -2825,8 +2825,20 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><ins>+
</ins><span class="cx"> function capital_P_dangit( $text ) {
</span><del>- return str_replace( 'Wordpress', 'WordPress', $text );
</del><ins>+ // Simple replacement for titles
+ if ( 'the_title' === current_filter() )
+ return str_replace( 'Wordpress', 'WordPress', $text );
+ // Still here? Use the more judicious replacement
+ static $dblq = false;
+ if ( false === $dblq )
+ $dblq = _x('&#8220;', 'opening curly quote');
+ return str_replace(
+ array( ' Wordpress', '&#8216;Wordpress', $dblq . 'Wordpress', '>Wordpress', '(Wordpress' ),
+ array( ' WordPress', '&#8216;WordPress', $dblq . 'WordPress', '>WordPress', '(WordPress' ),
+ $text );
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>