<!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>[20378] trunk: Introduce WP_User::exists().</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, #logmsg > ol { margin-left: 0; 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/20378">20378</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-04-06 19:18:45 +0000 (Fri, 06 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce WP_User::exists(). see <a href="http://core.trac.wordpress.org/ticket/20372">#20372</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpcommentspostphp">trunk/wp-comments-post.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesmsdeprecatedphp">trunk/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (20377 => 20378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2012-04-06 18:26:14 UTC (rev 20377)
+++ trunk/wp-admin/includes/ajax-actions.php 2012-04-06 19:18:45 UTC (rev 20378)
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx"> wp_die( __('ERROR: you are replying to a comment on a draft post.') );
</span><span class="cx">
</span><span class="cx"> $user = wp_get_current_user();
</span><del>- if ( $user->ID ) {
</del><ins>+ if ( $user->exists() ) {
</ins><span class="cx"> $user_ID = $user->ID;
</span><span class="cx"> $comment_author = $wpdb->escape($user->display_name);
</span><span class="cx"> $comment_author_email = $wpdb->escape($user->user_email);
</span></span></pre></div>
<a id="trunkwpcommentspostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-comments-post.php (20377 => 20378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-comments-post.php 2012-04-06 18:26:14 UTC (rev 20377)
+++ trunk/wp-comments-post.php 2012-04-06 19:18:45 UTC (rev 20378)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> // If the user is logged in
</span><span class="cx"> $user = wp_get_current_user();
</span><del>-if ( $user->ID ) {
</del><ins>+if ( $user->exists() ) {
</ins><span class="cx"> if ( empty( $user->display_name ) )
</span><span class="cx"> $user->display_name=$user->user_login;
</span><span class="cx"> $comment_author = $wpdb->escape($user->display_name);
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> $comment_type = '';
</span><span class="cx">
</span><del>-if ( get_option('require_name_email') && !$user->ID ) {
</del><ins>+if ( get_option('require_name_email') && !$user->exists() ) {
</ins><span class="cx"> if ( 6 > strlen($comment_author_email) || '' == $comment_author )
</span><span class="cx"> wp_die( __('<strong>ERROR</strong>: please fill the required fields (name, email).') );
</span><span class="cx"> elseif ( !is_email($comment_author_email))
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (20377 => 20378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2012-04-06 18:26:14 UTC (rev 20377)
+++ trunk/wp-includes/capabilities.php 2012-04-06 19:18:45 UTC (rev 20378)
</span><span class="lines">@@ -599,6 +599,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Determine whether the user exists in the database.
+ *
+ * @since 3.4.0
+ * @access public
+ *
+ * @return bool True if user exists in the database, false if not.
+ */
+ function exists() {
+ return ! empty( $this->ID );
+ }
+
+ /**
</ins><span class="cx"> * Retrieve the value of a property or meta key.
</span><span class="cx"> *
</span><span class="cx"> * Retrieves from the users and usermeta table.
</span><span class="lines">@@ -1259,7 +1271,7 @@
</span><span class="cx"> if ( ! is_object( $user ) )
</span><span class="cx"> $user = new WP_User( $user );
</span><span class="cx">
</span><del>- if ( ! $user || ! $user->ID )
</del><ins>+ if ( ! $user || ! $user->exists() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $args = array_slice( func_get_args(), 2 );
</span><span class="lines">@@ -1356,7 +1368,7 @@
</span><span class="cx"> else
</span><span class="cx"> $user = wp_get_current_user();
</span><span class="cx">
</span><del>- if ( empty( $user->ID ) )
</del><ins>+ if ( ! $user->exists() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() ) {
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (20377 => 20378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2012-04-06 18:26:14 UTC (rev 20377)
+++ trunk/wp-includes/comment-template.php 2012-04-06 19:18:45 UTC (rev 20378)
</span><span class="lines">@@ -1517,7 +1517,7 @@
</span><span class="cx">
</span><span class="cx"> $commenter = wp_get_current_commenter();
</span><span class="cx"> $user = wp_get_current_user();
</span><del>- $user_identity = ! empty( $user->ID ) ? $user->display_name : '';
</del><ins>+ $user_identity = $user->exists() ? $user->display_name : '';
</ins><span class="cx">
</span><span class="cx"> $req = get_option( 'require_name_email' );
</span><span class="cx"> $aria_req = ( $req ? " aria-required='true'" : '' );
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (20377 => 20378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2012-04-06 18:26:14 UTC (rev 20377)
+++ trunk/wp-includes/comment.php 2012-04-06 19:18:45 UTC (rev 20378)
</span><span class="lines">@@ -579,7 +579,7 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><span class="cx"> function wp_set_comment_cookies($comment, $user) {
</span><del>- if ( $user->ID )
</del><ins>+ if ( $user->exists() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
</span></span></pre></div>
<a id="trunkwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-deprecated.php (20377 => 20378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-deprecated.php 2012-04-06 18:26:14 UTC (rev 20377)
+++ trunk/wp-includes/ms-deprecated.php 2012-04-06 19:18:45 UTC (rev 20378)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> } else {
</span><span class="cx"> $user = get_user_by( 'login', $user_login );
</span><del>- if ( empty( $user->ID ) )
</del><ins>+ if ( ! $user->exists() )
</ins><span class="cx"> return false;
</span><span class="cx"> $user_id = $user->ID;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (20377 => 20378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2012-04-06 18:26:14 UTC (rev 20377)
+++ trunk/wp-includes/ms-functions.php 2012-04-06 19:18:45 UTC (rev 20378)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx">
</span><span class="cx"> $user = new WP_User($user_id);
</span><span class="cx">
</span><del>- if ( empty( $user->ID ) ) {
</del><ins>+ if ( ! $user->exists() ) {
</ins><span class="cx"> restore_current_blog();
</span><span class="cx"> return new WP_Error('user_does_not_exist', __('That user does not exist.'));
</span><span class="cx"> }
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx">
</span><span class="cx"> // wp_revoke_user($user_id);
</span><span class="cx"> $user = new WP_User($user_id);
</span><del>- if ( empty( $user->ID ) ) {
</del><ins>+ if ( ! $user->exists() ) {
</ins><span class="cx"> restore_current_blog();
</span><span class="cx"> return new WP_Error('user_does_not_exist', __('That user does not exist.'));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (20377 => 20378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2012-04-06 18:26:14 UTC (rev 20377)
+++ trunk/wp-includes/pluggable.php 2012-04-06 19:18:45 UTC (rev 20378)
</span><span class="lines">@@ -709,7 +709,7 @@
</span><span class="cx"> function is_user_logged_in() {
</span><span class="cx"> $user = wp_get_current_user();
</span><span class="cx">
</span><del>- if ( empty( $user->ID ) )
</del><ins>+ if ( ! $user->exists() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (20377 => 20378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2012-04-06 18:26:14 UTC (rev 20377)
+++ trunk/wp-includes/user.php 2012-04-06 19:18:45 UTC (rev 20378)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> else
</span><span class="cx"> $user = new WP_User( $user );
</span><span class="cx">
</span><del>- if ( ! isset( $user->ID ) )
</del><ins>+ if ( ! $user->exists() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( $user->has_prop( $wpdb->prefix . $option ) ) // Blog specific
</span><span class="lines">@@ -940,7 +940,7 @@
</span><span class="cx"> $user_ID = (int) $user->ID;
</span><span class="cx"> $user_level = (int) isset($user->user_level) ? $user->user_level : 0;
</span><span class="cx">
</span><del>- if ( 0 == $user->ID ) {
</del><ins>+ if ( ! $user->exists() ) {
</ins><span class="cx"> $user_login = $user_email = $user_url = $user_pass_md5 = $user_identity = '';
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>