Changeset 25562 for trunk/src/wp-includes/comment-template.php

Timestamp:

09/22/2013 10:15:38 AM (12 years ago)

Author:

ocean90

Message:

Replace !$user_ID with !is_user_logged_in(). props garyc40. see #15508.

File:

• trunk/src/wp-includes/comment-template.php (modified) (6 diffs)

trunk/src/wp-includes/comment-template.php

@@ -138 +138 @@
 /**
  * Retrieve the HTML link to the URL of the author of the current comment.
- * 
+ *
  * Both get_comment_author_url() and get_comment_author() rely on get_comment(),
  * which falls back to the global comment variable if the $comment_ID argument is empty.
@@ -1069 +1069 @@
  */
 function get_comment_reply_link($args = array(), $comment = null, $post = null) {
-    global $user_ID;
 
     $defaults = array(
@@ -1098 +1097 @@
     $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
@@ -1152 +1151 @@
  */
 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' => '');
+    $defaults = array(
+        'add_below'  => 'post',
+        'respond_id' => 'respond',
+        'reply_text' => __('Leave a Comment'),
+        'login_text' => __('Log in to leave a Comment'),
+        'before'     => '',
+        'after'      => '',
+    );
 
     $args = wp_parse_args($args, $defaults);
@@ -1164 +1167 @@
         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 {
@@ -1174 +1177 @@
 /**
  * Displays the HTML content for reply to post link.
- * 
+ *
  * @since 2.7.0
  *