<!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>[41061] trunk/src: Move `sanitizeText` and `stripTags` from press this to `wp.sanitize`.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/41061">41061</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/41061","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamsilverstein</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-07-15 15:47:16 +0000 (Sat, 15 Jul 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Move `sanitizeText` and `stripTags` from press this to `wp.sanitize`.
Introduce the `wp.sanitize` namespace and add two helpers for text sanitization. `stripTags` strips HTML tags from a string using regex.
Fixes <a href="https://core.trac.wordpress.org/ticket/40635">#40635</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjspressthisjs">trunk/src/wp-admin/js/press-this.js</a></li>
<li><a href="#trunksrcwpincludesjsutilsjs">trunk/src/wp-includes/js/utils.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjswpsanitizejs">trunk/src/wp-includes/js/wp-sanitize.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjspressthisjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/press-this.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/press-this.js 2017-07-14 23:00:55 UTC (rev 41060)
+++ trunk/src/wp-admin/js/press-this.js 2017-07-15 15:47:16 UTC (rev 41061)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $window = $( window ),
</span><span class="cx" style="display: block; padding: 0 10px"> $document = $( document ),
</span><span class="cx" style="display: block; padding: 0 10px"> saveAlert = false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- textarea = document.createElement( 'textarea' ),
</del><span class="cx" style="display: block; padding: 0 10px"> sidebarIsOpen = false,
</span><span class="cx" style="display: block; padding: 0 10px"> settings = window.wpPressThisConfig || {},
</span><span class="cx" style="display: block; padding: 0 10px"> data = window.wpPressThisData || {},
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,38 +55,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Strips HTML tags
- *
- * @param string string Text to have the HTML tags striped out of.
- * @returns string Stripped text.
- */
- function stripTags( string ) {
- string = string || '';
-
- return string
- .replace( /<!--[\s\S]*?(-->|$)/g, '' )
- .replace( /<(script|style)[^>]*>[\s\S]*?(<\/\1>|$)/ig, '' )
- .replace( /<\/?[a-z][\s\S]*?(>|$)/ig, '' );
- }
-
- /**
- * Strip HTML tags and convert HTML entities.
- *
- * @param text string Text.
- * @returns string Sanitized text.
- */
- function sanitizeText( text ) {
- var _text = stripTags( text );
-
- try {
- textarea.innerHTML = _text;
- _text = stripTags( textarea.value );
- } catch ( er ) {}
-
- return _text;
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Allow only HTTP or protocol relative URLs.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param url string The URL.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +64,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> url = $.trim( url || '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( /^(?:https?:)?\/\//.test( url ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- url = stripTags( url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ url = wp.sanitize.stripTags( url );
</ins><span class="cx" style="display: block; padding: 0 10px"> return url.replace( /["\\]+/g, '' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $image.replaceWith( $( '<span>' ).text( $image.attr( 'alt' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return sanitizeText( $element.text() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp.sanitize.sanitizeText( $element.text() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesjsutilsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/utils.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/utils.js 2017-07-14 23:00:55 UTC (rev 41060)
+++ trunk/src/wp-includes/js/utils.js 2017-07-15 15:47:16 UTC (rev 41061)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,3 +195,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return wpCookies.getHash( 'wp-settings-' + userSettings.uid ) || {};
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins></span></pre></div>
<a id="trunksrcwpincludesjswpsanitizejs"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/js/wp-sanitize.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wp-sanitize.js (rev 0)
+++ trunk/src/wp-includes/js/wp-sanitize.js 2017-07-15 15:47:16 UTC (rev 41061)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,47 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+( function () {
+
+ window.wp = window.wp || {};
+
+ /**
+ * wp.sanitize
+ *
+ * Helper functions to sanitize strings.
+ */
+ wp.sanitize = {
+
+ /**
+ * Strip HTML tags.
+ *
+ * @param {string} text Text to have the HTML tags striped out of.
+ *
+ * @return Stripped text.
+ */
+ stripTags: function( text ) {
+ text = text || '';
+
+ return text
+ .replace( /<!--[\s\S]*?(-->|$)/g, '' )
+ .replace( /<(script|style)[^>]*>[\s\S]*?(<\/\1>|$)/ig, '' )
+ .replace( /<\/?[a-z][\s\S]*?(>|$)/ig, '' );
+ },
+
+ /**
+ * Strip HTML tags and convert HTML entities.
+ *
+ * @param {string} text Text to strip tags and convert HTML entities.
+ *
+ * @return Sanitized text. False on failure.
+ */
+ sanitizeText: function( text ) {
+ var _text = wp.utils.stripTags( text ),
+ textarea = document.createElement( 'textarea' );
+
+ try {
+ textarea.innerHTML = _text;
+ _text = wp.utils.stripTags( textarea.value );
+ } catch ( er ) {}
+
+ return _text;
+ }
+ };
+}() );
</ins></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2017-07-14 23:00:55 UTC (rev 41060)
+++ trunk/src/wp-includes/script-loader.php 2017-07-15 15:47:16 UTC (rev 41061)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,6 +338,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'wp-sanitize', "/wp-includes/js/wp-sanitize$suffix.js", array('jquery'), false, 1 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone', 'wp-util'), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'wp-backbone', 'jquery-ui-slider', 'hoverIntent' ), false, 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -576,7 +578,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'permalinkSaved' => __( 'Permalink saved' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'press-this', "/wp-admin/js/press-this$suffix.js", array( 'jquery', 'tags-box' ), false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'press-this', "/wp-admin/js/press-this$suffix.js", array( 'jquery', 'tags-box', 'wp-sanitize' ), false, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'press-this', 'pressThisL10n', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'newPost' => __( 'Title' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'serverError' => __( 'Connection lost or the server is busy. Please try again later.' ),
</span></span></pre>
</div>
</div>
</body>
</html>