Changeset 33963

Timestamp:

09/09/2015 02:50:43 AM (9 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.

Location:

trunk/src

Files:

• wp-admin/includes/comment.php (modified) (1 diff)
• wp-includes/comment-functions.php (modified) (1 diff)
• wp-includes/comment-template.php (modified) (7 diffs)
• wp-includes/link-template.php (modified) (2 diffs)
• wp-includes/query.php (modified) (1 diff)

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

@@ -157 +157 @@
  * @since 2.5.0
  *
- * @global object $comment
- *
  * @param string $name User name.
  * @return string Avatar with Admin name.
  */
 function floated_admin_avatar( $name ) {
-    global $comment;
-    $avatar = get_avatar( $comment, 32, 'mystery' );
+    $avatar = get_avatar( get_comment(), 32, 'mystery' );
     return "$avatar $name";
 }

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

@@ -170 +170 @@
  * @return WP_Comment|array|null Depends on $output value.
  */
-function get_comment(&$comment, $output = OBJECT) {
+function get_comment( &$comment = null, $output = OBJECT ) {
     if ( empty( $comment ) && isset( $GLOBALS['comment'] ) ) {
         $comment = $GLOBALS['comment'];

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' );

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

@@ -1312 +1312 @@
  * @since 1.0.0
  *
- * @global object $comment
- *
  * @param string $text   Optional. Anchor text.
  * @param string $before Optional. Display before edit link.
@@ -1319 +1317 @@
  */
 function edit_comment_link( $text = null, $before = '', $after = '' ) {
-    global $comment;
+    $comment = get_comment();
 
     if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {

trunk/src/wp-includes/query.php

@@ -3845 +3845 @@
      * @since 2.2.0
      * @access public
-     * @global object $comment Current comment.
+     * @global WP_Comment $comment Current comment.
      */
     public function the_comment() {