<!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" />
<title>[18705] trunk/wp-includes: Strip a number of special characters in sanitize_title_with_dashes on save.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18705">18705</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-09-18 19:53:59 +0000 (Sun, 18 Sep 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Strip a number of special characters in sanitize_title_with_dashes on save. Includes quotes (curly, angle), dashes, marks, etc. props SergeyBiryukov. props ampt for the unit tests in [UT438]. see <a href="http://core.trac.wordpress.org/ticket/10797">#10797</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (18704 => 18705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2011-09-18 19:39:49 UTC (rev 18704)
+++ trunk/wp-includes/default-filters.php 2011-09-18 19:53:59 UTC (rev 18705)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> add_filter( 'option_siteurl', '_config_wp_siteurl' );
</span><span class="cx"> add_filter( 'tiny_mce_before_init', '_mce_set_direction' );
</span><span class="cx"> add_filter( 'pre_kses', 'wp_pre_kses_less_than' );
</span><del>-add_filter( 'sanitize_title', 'sanitize_title_with_dashes' );
</del><ins>+add_filter( 'sanitize_title', 'sanitize_title_with_dashes', 10, 3 );
</ins><span class="cx"> add_action( 'check_comment_flood', 'check_comment_flood_db', 10, 3 );
</span><span class="cx"> add_filter( 'comment_flood_filter', 'wp_throttle_comment_flood', 10, 3 );
</span><span class="cx"> add_filter( 'pre_comment_content', 'wp_rel_nofollow', 15 );
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (18704 => 18705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2011-09-18 19:39:49 UTC (rev 18704)
+++ trunk/wp-includes/formatting.php 2011-09-18 19:53:59 UTC (rev 18705)
</span><span class="lines">@@ -803,7 +803,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Sanitizes title, replacing whitespace with dashes.
</del><ins>+ * Sanitizes title, replacing whitespace and a few other characters with dashes.
</ins><span class="cx"> *
</span><span class="cx"> * Limits the output to alphanumeric characters, underscore (_) and dash (-).
</span><span class="cx"> * Whitespace becomes a dash.
</span><span class="lines">@@ -811,9 +811,11 @@
</span><span class="cx"> * @since 1.2.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $title The title to be sanitized.
</span><ins>+ * @param string $raw_title Optional. Not used.
+ * @param string $context Optional. The operation for which the string is sanitized.
</ins><span class="cx"> * @return string The sanitized title.
</span><span class="cx"> */
</span><del>-function sanitize_title_with_dashes($title) {
</del><ins>+function sanitize_title_with_dashes($title, $raw_title = '', $context = 'display') {
</ins><span class="cx"> $title = strip_tags($title);
</span><span class="cx"> // Preserve escaped octets.
</span><span class="cx"> $title = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '---$1---', $title);
</span><span class="lines">@@ -832,6 +834,20 @@
</span><span class="cx"> $title = strtolower($title);
</span><span class="cx"> $title = preg_replace('/&.+?;/', '', $title); // kill entities
</span><span class="cx"> $title = str_replace('.', '-', $title);
</span><ins>+
+ if ( 'save' == $context ) {
+ // nbsp, ndash and mdash
+ $title = str_replace( array( '%c2%a0', '%e2%80%93', '%e2%80%94' ), '-', $title );
+ // iexcl and iquest
+ $title = str_replace( array( '%c2%a1', '%c2%bf' ), '', $title );
+ // angle quotes
+ $title = str_replace( array( '%c2%ab', '%c2%bb', '%e2%80%b9', '%e2%80%ba' ), '', $title );
+ // curly quotes
+ $title = str_replace( array( '%e2%80%98', '%e2%80%99', '%e2%80%9c', '%e2%80%9d' ), '', $title );
+ // copy, reg, deg, hellip and trade
+ $title = str_replace( array( '%c2%a9', '%c2%ae', '%c2%b0', '%e2%80%a6', '%e2%84%a2' ), '', $title );
+ }
+
</ins><span class="cx"> $title = preg_replace('/[^%a-z0-9 _-]/', '', $title);
</span><span class="cx"> $title = preg_replace('/\s+/', '-', $title);
</span><span class="cx"> $title = preg_replace('|-+|', '-', $title);
</span></span></pre>
</div>
</div>
</body>
</html>