<!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>[25109] trunk/src/wp-includes/option.php: User state settings:</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/25109">25109</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-08-23 21:42:23 +0000 (Fri, 23 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>User state settings:
- Allow empty cookie value to be saved.
- Use get_current_user_id() instead of wp_get_current_user().
- Use is_user_member_of_blog().
- Sanitize both name and value in wp_set_all_user_settings().
- Some var names and code formatting cleanup.
Fixes <a href="http://core.trac.wordpress.org/ticket/24921">#24921</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesoptionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/option.php (25108 => 25109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/option.php 2013-08-23 21:28:34 UTC (rev 25108)
+++ trunk/src/wp-includes/option.php 2013-08-23 21:42:23 UTC (rev 25109)
</span><span class="lines">@@ -541,37 +541,36 @@
</span><span class="cx"> if ( defined('DOING_AJAX') )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( ! $user = wp_get_current_user() )
</del><ins>+ if ( ! $user_id = get_current_user_id() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( is_super_admin( $user->ID ) &&
- ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user->ID ) ) )
- )
</del><ins>+ if ( is_super_admin() && ! is_user_member_of_blog() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- $settings = get_user_option( 'user-settings', $user->ID );
</del><ins>+ $settings = (string) get_user_option( 'user-settings', $user_id );
</ins><span class="cx">
</span><del>- if ( isset( $_COOKIE['wp-settings-' . $user->ID] ) ) {
- $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user->ID] );
</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><del>- if ( ! empty( $cookie ) && strpos( $cookie, '=' ) ) {
- if ( $cookie == $settings )
- return;
</del><ins>+ // No change or both empty
+ if ( $cookie == $settings )
+ return;
</ins><span class="cx">
</span><del>- $last_time = (int) get_user_option( 'user-settings-time', $user->ID );
- $saved = isset( $_COOKIE['wp-settings-time-' . $user->ID]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user->ID] ) : 0;
</del><ins>+ $last_saved = (int) get_user_option( 'user-settings-time', $user_id );
+ $current = isset( $_COOKIE['wp-settings-time-' . $user_id]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user_id] ) : 0;
</ins><span class="cx">
</span><del>- if ( $saved > $last_time ) {
- update_user_option( $user->ID, 'user-settings', $cookie, false );
- update_user_option( $user->ID, 'user-settings-time', time() - 5, false );
- return;
- }
</del><ins>+ // The cookie is newer than the saved value. Update the user_option and leave the cookie as-is
+ if ( $current > $last_saved ) {
+ update_user_option( $user_id, 'user-settings', $cookie, false );
+ update_user_option( $user_id, 'user-settings-time', time() - 5, false );
+ return;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setcookie( 'wp-settings-' . $user->ID, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH );
- setcookie( 'wp-settings-time-' . $user->ID, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH );
- $_COOKIE['wp-settings-' . $user->ID] = $settings;
</del><ins>+ // The cookie is not set in the current browser or the saved value is newer.
+ setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH );
+ setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH );
+ $_COOKIE['wp-settings-' . $user_id] = $settings;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -586,10 +585,9 @@
</span><span class="cx"> * @return mixed the last saved user setting or the default value/false if it doesn't exist.
</span><span class="cx"> */
</span><span class="cx"> function get_user_setting( $name, $default = false ) {
</span><ins>+ $all_user_settings = get_all_user_settings();
</ins><span class="cx">
</span><del>- $all = get_all_user_settings();
-
- return isset($all[$name]) ? $all[$name] : $default;
</del><ins>+ return isset( $all_user_settings[$name] ) ? $all_user_settings[$name] : $default;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -611,15 +609,10 @@
</span><span class="cx"> if ( headers_sent() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $all = get_all_user_settings();
- $name = preg_replace( '/[^A-Za-z0-9_]+/', '', $name );
</del><ins>+ $all_user_settings = get_all_user_settings();
+ $all_user_settings[$name] = $value;
</ins><span class="cx">
</span><del>- if ( empty($name) )
- return false;
-
- $all[$name] = $value;
-
- return wp_set_all_user_settings($all);
</del><ins>+ return wp_set_all_user_settings( $all_user_settings );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -640,18 +633,19 @@
</span><span class="cx"> if ( headers_sent() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $all = get_all_user_settings();
</del><ins>+ $all_user_settings = get_all_user_settings();
</ins><span class="cx"> $names = (array) $names;
</span><ins>+ $deleted = false;
</ins><span class="cx">
</span><span class="cx"> foreach ( $names as $name ) {
</span><del>- if ( isset($all[$name]) ) {
- unset($all[$name]);
</del><ins>+ if ( isset( $all_user_settings[$name] ) ) {
+ unset( $all_user_settings[$name] );
</ins><span class="cx"> $deleted = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset($deleted) )
- return wp_set_all_user_settings($all);
</del><ins>+ if ( $deleted )
+ return wp_set_all_user_settings( $all_user_settings );
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -668,26 +662,27 @@
</span><span class="cx"> function get_all_user_settings() {
</span><span class="cx"> global $_updated_user_settings;
</span><span class="cx">
</span><del>- if ( ! $user = wp_get_current_user() )
</del><ins>+ if ( ! $user_id = get_current_user_id() )
</ins><span class="cx"> return array();
</span><span class="cx">
</span><del>- if ( isset($_updated_user_settings) && is_array($_updated_user_settings) )
</del><ins>+ if ( isset( $_updated_user_settings ) && is_array( $_updated_user_settings ) )
</ins><span class="cx"> return $_updated_user_settings;
</span><span class="cx">
</span><del>- $all = array();
- if ( isset($_COOKIE['wp-settings-' . $user->ID]) ) {
- $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user->ID] );
</del><ins>+ $user_settings = array();
+ if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
+ $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
</ins><span class="cx">
</span><del>- if ( $cookie && strpos($cookie, '=') ) // the '=' cannot be 1st char
- parse_str($cookie, $all);
</del><ins>+ if ( $cookie && strpos( $cookie, '=' ) ) // '=' cannot be 1st char
+ parse_str( $cookie, $user_settings );
</ins><span class="cx">
</span><span class="cx"> } else {
</span><del>- $option = get_user_option('user-settings', $user->ID);
</del><ins>+ $option = get_user_option( 'user-settings', $user_id );
</ins><span class="cx"> if ( $option && is_string($option) )
</span><del>- parse_str( $option, $all );
</del><ins>+ parse_str( $option, $user_settings );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return $all;
</del><ins>+ $_updated_user_settings = $user_settings;
+ return $user_settings;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -697,31 +692,32 @@
</span><span class="cx"> * @subpackage Option
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><del>- * @param unknown $all
</del><ins>+ * @param array $user_settings
</ins><span class="cx"> * @return bool
</span><span class="cx"> */
</span><del>-function wp_set_all_user_settings($all) {
</del><ins>+function wp_set_all_user_settings( $user_settings ) {
</ins><span class="cx"> global $_updated_user_settings;
</span><span class="cx">
</span><del>- if ( ! $user = wp_get_current_user() )
</del><ins>+ if ( ! $user_id = get_current_user_id() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( is_super_admin( $user->ID ) &&
- ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user->ID ) ) )
- )
</del><ins>+ if ( is_super_admin() && ! is_user_member_of_blog() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- $_updated_user_settings = $all;
</del><span class="cx"> $settings = '';
</span><del>- foreach ( $all as $k => $v ) {
- $v = preg_replace( '/[^A-Za-z0-9_]+/', '', $v );
- $settings .= $k . '=' . $v . '&';
</del><ins>+ foreach ( $user_settings as $name => $value ) {
+ $_name = preg_replace( '/[^A-Za-z0-9_]+/', '', $name );
+ $_value = preg_replace( '/[^A-Za-z0-9_]+/', '', $value );
+
+ if ( ! empty( $_name ) )
+ $settings .= $_name . '=' . $_value . '&';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $settings = rtrim($settings, '&');
</span><ins>+ parse_str( $settings, $_updated_user_settings );
</ins><span class="cx">
</span><del>- update_user_option( $user->ID, 'user-settings', $settings, false );
- update_user_option( $user->ID, 'user-settings-time', time(), false );
</del><ins>+ update_user_option( $user_id, 'user-settings', $settings, false );
+ update_user_option( $user_id, 'user-settings-time', time(), false );
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -734,11 +730,11 @@
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> */
</span><span class="cx"> function delete_all_user_settings() {
</span><del>- if ( ! $user = wp_get_current_user() )
</del><ins>+ if ( ! $user_id = get_current_user_id() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- update_user_option( $user->ID, 'user-settings', '', false );
- setcookie('wp-settings-' . $user->ID, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH);
</del><ins>+ update_user_option( $user_id, 'user-settings', '', false );
+ 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>
</div>
</body>
</html>