<!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>[24252] trunk/wp-includes: jQuery Migrate 1.2.1.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24252">24252</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2013-05-14 17:22:58 +0000 (Tue, 14 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>jQuery Migrate 1.2.1. see <a href="http://core.trac.wordpress.org/ticket/22975">#22975</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsjqueryjquerymigratejs">trunk/wp-includes/js/jquery/jquery-migrate.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsjqueryjquerymigratejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/jquery/jquery-migrate.js (24251 => 24252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/jquery/jquery-migrate.js 2013-05-14 15:55:21 UTC (rev 24251)
+++ trunk/wp-includes/js/jquery/jquery-migrate.js 2013-05-14 17:22:58 UTC (rev 24252)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*!
</span><del>- * jQuery Migrate - v1.1.1 - 2013-02-16
</del><ins>+ * jQuery Migrate - v1.2.1 - 2013-05-08
</ins><span class="cx"> * https://github.com/jquery/jquery-migrate
</span><span class="cx"> * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
</span><span class="cx"> */
</span><span class="lines">@@ -17,8 +17,8 @@
</span><span class="cx"> // jQuery.migrateMute = false;
</span><span class="cx">
</span><span class="cx"> // Show a message on the console so devs know we're active
</span><del>-if ( !jQuery.migrateMute && window.console && console.log ) {
- console.log("JQMIGRATE: Logging is active");
</del><ins>+if ( !jQuery.migrateMute && window.console && window.console.log ) {
+ window.console.log("JQMIGRATE: Logging is active");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Set to false to disable traces that appear with warnings
</span><span class="lines">@@ -33,10 +33,11 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function migrateWarn( msg) {
</span><ins>+ var console = window.console;
</ins><span class="cx"> if ( !warnedAbout[ msg ] ) {
</span><span class="cx"> warnedAbout[ msg ] = true;
</span><span class="cx"> jQuery.migrateWarnings.push( msg );
</span><del>- if ( window.console && console.warn && !jQuery.migrateMute ) {
</del><ins>+ if ( console && console.warn && !jQuery.migrateMute ) {
</ins><span class="cx"> console.warn( "JQMIGRATE: " + msg );
</span><span class="cx"> if ( jQuery.migrateTrace && console.trace ) {
</span><span class="cx"> console.trace();
</span><span class="lines">@@ -189,26 +190,35 @@
</span><span class="cx"> var matched, browser,
</span><span class="cx"> oldInit = jQuery.fn.init,
</span><span class="cx"> oldParseJSON = jQuery.parseJSON,
</span><del>- // Note this does NOT include the #9521 XSS fix from 1.7!
- rquickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*|#([\w\-]*))$/;
</del><ins>+ // Note: XSS check is done below after string is trimmed
+ rquickExpr = /^([^<]*)(<[\w\W]+>)([^>]*)$/;
</ins><span class="cx">
</span><span class="cx"> // $(html) "looks like html" rule change
</span><span class="cx"> jQuery.fn.init = function( selector, context, rootjQuery ) {
</span><span class="cx"> var match;
</span><span class="cx">
</span><span class="cx"> if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) &&
</span><del>- (match = rquickExpr.exec( selector )) && match[1] ) {
</del><ins>+ (match = rquickExpr.exec( jQuery.trim( selector ) )) && match[ 0 ] ) {
</ins><span class="cx"> // This is an HTML string according to the "old" rules; is it still?
</span><span class="cx"> if ( selector.charAt( 0 ) !== "<" ) {
</span><span class="cx"> migrateWarn("$(html) HTML strings must start with '<' character");
</span><span class="cx"> }
</span><ins>+ if ( match[ 3 ] ) {
+ migrateWarn("$(html) HTML text after last tag is ignored");
+ }
+ // Consistently reject any HTML-like string starting with a hash (#9521)
+ // Note that this may break jQuery 1.6.x code that otherwise would work.
+ if ( match[ 0 ].charAt( 0 ) === "#" ) {
+ migrateWarn("HTML string cannot start with a '#' character");
+ jQuery.error("JQMIGRATE: Invalid selector string (XSS)");
+ }
</ins><span class="cx"> // Now process using loose rules; let pre-1.8 play too
</span><span class="cx"> if ( context && context.context ) {
</span><span class="cx"> // jQuery object as context; parseHTML expects a DOM object
</span><span class="cx"> context = context.context;
</span><span class="cx"> }
</span><span class="cx"> if ( jQuery.parseHTML ) {
</span><del>- return oldInit.call( this, jQuery.parseHTML( jQuery.trim(selector), context, true ),
</del><ins>+ return oldInit.call( this, jQuery.parseHTML( match[ 2 ], context, true ),
</ins><span class="cx"> context, rootjQuery );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (24251 => 24252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2013-05-14 15:55:21 UTC (rev 24251)
+++ trunk/wp-includes/script-loader.php 2013-05-14 17:22:58 UTC (rev 24252)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> // jQuery
</span><span class="cx"> $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ) );
</span><span class="cx"> $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.9.1' );
</span><del>- $scripts->add( 'jquery-migrate', '/wp-includes/js/jquery/jquery-migrate.js', array(), '1.1.1' );
</del><ins>+ $scripts->add( 'jquery-migrate', '/wp-includes/js/jquery/jquery-migrate.js', array(), '1.2.1' );
</ins><span class="cx">
</span><span class="cx"> // full jQuery UI
</span><span class="cx"> $scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui/jquery.ui.core.min.js', array('jquery'), '1.10.3', 1 );
</span></span></pre>
</div>
</div>
</body>
</html>