<!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>[29478] trunk/src/wp-includes: Fix the `wp-settings-*` cookies used in getUserSetting()/setUserSetting().</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/29478">29478</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-08-13 02:46:18 +0000 (Wed, 13 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the `wp-settings-*` cookies used in getUserSetting()/setUserSetting(). They should be set without `COOKIE_DOMAIN` to work properly for sub-domains. Fixes <a href="http://core.trac.wordpress.org/ticket/29095">#29095</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsutilsjs">trunk/src/wp-includes/js/utils.js</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/utils.js (29477 => 29478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/utils.js 2014-08-13 02:30:24 UTC (rev 29477)
+++ trunk/src/wp-includes/js/utils.js 2014-08-13 02:46:18 UTC (rev 29478)
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> *
</span><span class="cx"> * This is done by setting it to an empty value and setting the expiration time in the past.
</span><span class="cx"> */
</span><del>- remove: function( name, path ) {
- this.set( name, '', -1000, path );
</del><ins>+ remove: function( name, path, domain, secure ) {
+ this.set( name, '', -1000, path, domain, secure );
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -157,9 +157,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var uid = userSettings.uid,
</span><del>- oldUid = uid.lastIndexOf('-') > 0 ? uid.substring( 0, uid.lastIndexOf('-') ) : 0,
</del><span class="cx"> settings = wpCookies.getHash( 'wp-settings-' + uid ),
</span><del>- path = userSettings.url;
</del><ins>+ path = userSettings.url,
+ secure = !! userSettings.secure;
</ins><span class="cx">
</span><span class="cx"> name = name.toString().replace( /[^A-Za-z0-9_]/, '' );
</span><span class="cx">
</span><span class="lines">@@ -169,17 +169,6 @@
</span><span class="cx"> value = value.toString().replace( /[^A-Za-z0-9_]/, '' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( oldUid ) {
- if ( ! settings ) {
- settings = wpCookies.getHash( 'wp-settings-' + oldUid );
- }
- // Delete old cookies
- if ( wpCookies.get( 'wp-settings-time-' + oldUid ) ) {
- wpCookies.remove( 'wp-settings-' + oldUid, path );
- wpCookies.remove( 'wp-settings-time-' + oldUid, path );
- }
- }
-
</del><span class="cx"> settings = settings || {};
</span><span class="cx">
</span><span class="cx"> if ( _del ) {
</span><span class="lines">@@ -188,8 +177,8 @@
</span><span class="cx"> settings[name] = value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- wpCookies.setHash( 'wp-settings-' + uid, settings, 31536000, path );
- wpCookies.set( 'wp-settings-time-' + uid, userSettings.time, 31536000, path );
</del><ins>+ wpCookies.setHash( 'wp-settings-' + uid, settings, 31536000, path, '', secure );
+ wpCookies.set( 'wp-settings-time-' + uid, userSettings.time, 31536000, path, '', secure );
</ins><span class="cx">
</span><span class="cx"> return name;
</span><span class="cx"> }
</span><span class="lines">@@ -204,14 +193,5 @@
</span><span class="cx"> return {};
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var uid = userSettings.uid,
- settings = wpCookies.getHash( 'wp-settings-' + uid );
-
- // Try the old format cookie
- if ( ! settings && uid.lastIndexOf('-') > 0 ) {
- uid = uid.substring( 0, uid.lastIndexOf('-') );
- settings = wpCookies.getHash( 'wp-settings-' + uid );
- }
-
- return settings || {};
</del><ins>+ return wpCookies.getHash( 'wp-settings-' + userSettings.uid ) || {};
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesoptionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/option.php (29477 => 29478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/option.php 2014-08-13 02:30:24 UTC (rev 29477)
+++ trunk/src/wp-includes/option.php 2014-08-13 02:46:18 UTC (rev 29478)
</span><span class="lines">@@ -726,17 +726,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $settings = (string) get_user_option( 'user-settings', $user_id );
</span><del>- $uid = $user_id . '-' . get_current_blog_id();
</del><span class="cx">
</span><del>- if ( isset( $_COOKIE['wp-settings-' . $uid] ) ) {
- $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $uid] );
</del><ins>+ if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
+ $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
</ins><span class="cx">
</span><span class="cx"> // No change or both empty
</span><span class="cx"> if ( $cookie == $settings )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $last_saved = (int) get_user_option( 'user-settings-time', $user_id );
</span><del>- $current = isset( $_COOKIE['wp-settings-time-' . $uid]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $uid] ) : 0;
</del><ins>+ $current = isset( $_COOKIE['wp-settings-time-' . $user_id]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user_id] ) : 0;
</ins><span class="cx">
</span><span class="cx"> // The cookie is newer than the saved value. Update the user_option and leave the cookie as-is
</span><span class="cx"> if ( $current > $last_saved ) {
</span><span class="lines">@@ -748,9 +747,9 @@
</span><span class="cx">
</span><span class="cx"> // The cookie is not set in the current browser or the saved value is newer.
</span><span class="cx"> $secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) );
</span><del>- setcookie( 'wp-settings-' . $uid, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
- setcookie( 'wp-settings-time-' . $uid, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
- $_COOKIE['wp-settings-' . $uid] = $settings;
</del><ins>+ setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
+ setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
+ $_COOKIE['wp-settings-' . $user_id] = $settings;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -846,20 +845,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $user_settings = array();
</span><del>- $uid = $user_id . '-' . get_current_blog_id();
</del><span class="cx">
</span><del>- if ( isset( $_COOKIE['wp-settings-' . $uid] ) ) {
- $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $uid] );
- } elseif ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
</del><ins>+ if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
</ins><span class="cx"> $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
</span><del>- }
</del><span class="cx">
</span><del>- if ( ! empty( $cookie ) && strpos( $cookie, '=' ) ) { // '=' cannot be 1st char
- parse_str( $cookie, $user_settings );
</del><ins>+ if ( strpos( $cookie, '=' ) ) { // '=' cannot be 1st char
+ parse_str( $cookie, $user_settings );
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> $option = get_user_option( 'user-settings', $user_id );
</span><del>- if ( $option && is_string( $option ) )
</del><ins>+
+ if ( $option && is_string( $option ) ) {
</ins><span class="cx"> parse_str( $option, $user_settings );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $_updated_user_settings = $user_settings;
</span><span class="lines">@@ -914,9 +912,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $uid = $user_id . '-' . get_current_blog_id();
</del><span class="cx"> update_user_option( $user_id, 'user-settings', '', false );
</span><del>- setcookie( 'wp-settings-' . $uid, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );
</del><ins>+ setcookie( 'wp-settings-' . $user_id, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/script-loader.php (29477 => 29478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/script-loader.php 2014-08-13 02:30:24 UTC (rev 29477)
+++ trunk/src/wp-includes/script-loader.php 2014-08-13 02:46:18 UTC (rev 29478)
</span><span class="lines">@@ -72,8 +72,9 @@
</span><span class="cx"> $scripts->add( 'utils', "/wp-includes/js/utils$suffix.js" );
</span><span class="cx"> did_action( 'init' ) && $scripts->localize( 'utils', 'userSettings', array(
</span><span class="cx"> 'url' => (string) SITECOOKIEPATH,
</span><del>- 'uid' => get_current_user_id() . '-' . get_current_blog_id(),
</del><ins>+ 'uid' => (string) get_current_user_id(),
</ins><span class="cx"> 'time' => (string) time(),
</span><ins>+ 'secure' => (string) ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) ),
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 );
</span></span></pre>
</div>
</div>
</body>
</html>