Ticket #15508: 15508.diff

wp-comments-post.php

@@ -73 +73 @@
 
 $comment_type = '';
 
-if ( get_option('require_name_email') && !$user->ID ) {
+if ( get_option('require_name_email') && ! is_user_logged_in() ) {
         if ( 6 > strlen($comment_author_email) || '' == $comment_author )
                 wp_die( __('Error: please fill the required fields (name, email).') );
         elseif ( !is_email($comment_author_email))
@@ -90 +90 @@
 $comment_id = wp_new_comment( $commentdata );
 
 $comment = get_comment($comment_id);
-if ( !$user->ID ) {
+if ( ! is_user_logged_in() ) {
         $comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
         setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
         setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);

wp-includes/comment-template.php

@@ -1034 +1034 @@
  * @return string|bool|null Link to show comment form, if successful. False, if comments are closed.
  */
 function get_comment_reply_link($args = array(), $comment = null, $post = null) {
-        global $user_ID;
-
         $defaults = array('add_below' => 'comment', 'respond_id' => 'respond', 'reply_text' => __('Reply'),
                 'login_text' => __('Log in to Reply'), 'depth' => 0, 'before' => '', 'after' => '');
 
@@ -1056 +1054 @@
 
         $link = '';
 
-        if ( get_option('comment_registration') && !$user_ID )
+        if ( get_option('comment_registration') && ! is_user_logged_in() )
                 $link = '<a rel="nofollow" class="comment-reply-login" href="' . esc_url( wp_login_url( get_permalink() ) ) . '">' . $login_text . '</a>';
         else
                 $link = "<a class='comment-reply-link' href='" . esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
@@ -1095 +1093 @@
  * @return string|bool|null Link to show comment form, if successful. False, if comments are closed.
  */
 function get_post_reply_link($args = array(), $post = null) {
-        global $user_ID;
-
         $defaults = array('add_below' => 'post', 'respond_id' => 'respond', 'reply_text' => __('Leave a Comment'),
                 'login_text' => __('Log in to leave a Comment'), 'before' => '', 'after' => '');
 
@@ -1107 +1103 @@
         if ( !comments_open($post->ID) )
                 return false;
 
-        if ( get_option('comment_registration') && !$user_ID ) {
+        if ( get_option('comment_registration') && ! is_user_logged_in() ) {
                 $link = '<a rel="nofollow" href="' . wp_login_url( get_permalink() ) . '">' . $login_text . '</a>';
         } else {
                 $link = "<a rel='nofollow' class='comment-reply-link' href='" . get_permalink($post->ID) . "#$respond_id' onclick='return addComment.moveForm(\"$add_below-$post->ID\", \"0\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";

wp-includes/ms-deprecated.php

@@ -44 +44 @@
         _deprecated_function( __FUNCTION__, '3.0', 'is_super_admin()' );
 
         if ( empty( $user_login ) ) {
-                $user_id = get_current_user_id();
-                if ( !$user_id )
+                if ( ! is_user_logged_in() )
                         return false;
         } else {
                 $user = get_user_by( 'login', $user_login );