<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11935] trunk/wp-includes/formatting.php:
Strip \r when escaping strings for JS, props nbachiyski, fixes #7041</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11935">11935</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-09-15 10:11:59 +0000 (Tue, 15 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Strip \r when escaping strings for JS, props nbachiyski, fixes <a href="http://trac.wordpress.org/ticket/7041">#7041</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (11934 => 11935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2009-09-15 02:21:00 UTC (rev 11934)
+++ trunk/wp-includes/formatting.php 2009-09-15 10:11:59 UTC (rev 11935)
</span><span class="lines">@@ -2199,8 +2199,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Escape single quotes, specialchar double quotes, and fix line endings.
</del><ins>+ * Escape single quotes, htmlspecialchar " < > &, and fix line endings.
</ins><span class="cx"> *
</span><ins>+ * Escapes text strings for echoing in JS, both inline (for example in onclick="...")
+ * and inside <script> tag. Note that the strings have to be in single quotes.
</ins><span class="cx"> * The filter 'js_escape' is also applied here.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span><span class="lines">@@ -2212,7 +2214,8 @@
</span><span class="cx"> $safe_text = wp_check_invalid_utf8( $text );
</span><span class="cx"> $safe_text = _wp_specialchars( $safe_text, ENT_COMPAT );
</span><span class="cx"> $safe_text = preg_replace( '/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes( $safe_text ) );
</span><del>- $safe_text = preg_replace( "/\r?\n/", "\\n", addslashes( $safe_text ) );
</del><ins>+ $safe_text = str_replace( "\r", '', $safe_text );
+ $safe_text = str_replace( "\n", '\\n', addslashes( $safe_text ) );
</ins><span class="cx"> return apply_filters( 'js_escape', $safe_text, $text );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>