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

Timestamp:

09/09/2015 02:50:43 AM (8 years ago)

Author:

wonderboymusic

Message:

After [33891], get_comment() returns global $comment if no args are passed and the global is set (after setting the default to null here). This allows us to ditch global comment imports.

See #33638.

File:

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

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

@@ -153 +153 @@
  * address and use it for their own means good and bad.
  *
- * @global object $comment The current Comment row object.
- *
  * @since 2.7.0
  *
@@ -164 +162 @@
  */
 function get_comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
-    global $comment;
-
+    $comment = get_comment();
     /**
      * Filter the comment author's email for display.
@@ -605 +602 @@
  * @since 1.5.0
  *
- * @global object $comment
- *
  * @return int The comment ID.
  */
 function get_comment_ID() {
-    global $comment;
+    $comment = get_comment();
 
     /**
@@ -874 +869 @@
  * @since 1.5.0
  *
- * @global object $comment
- *
  * @param string $d         Optional. The format of the time. Default user's settings.
  * @param bool   $gmt       Optional. Whether to use the GMT date. Default false.
@@ -883 +876 @@
  */
 function get_comment_time( $d = '', $gmt = false, $translate = true ) {
-    global $comment;
+    $comment = get_comment();
+
     $comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
     if ( '' == $d )
@@ -1654 +1648 @@
  * @since 2.7.0
  *
- * @global object $comment
- *
  * @param string $noreplytext  Optional. Text to display when not replying to a comment.
  *                             Default false.
@@ -1665 +1657 @@
  */
 function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
-    global $comment;
+    $comment = get_comment();
 
     if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );