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

Timestamp:

04/22/2016 10:44:33 PM (9 years ago)

Author:

wonderboymusic

Message:

Comments: add a $comment parameter to get_comment_author_url_link().

Add unit tests (none exist).

Props flixos90, wonderboymusic.
Fixes #36573.

File:

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

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

@@ -294 +294 @@
 function get_comment_author_url( $comment_ID = 0 ) {
     $comment = get_comment( $comment_ID );
-    $url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
-    $url = esc_url( $url, array('http', 'https') );
+    $url = '';
+    $id = 0;
+    if ( ! empty( $comment ) ) {
+        $author_url = ( 'http://' == $comment->comment_author_url ) ? '' : $comment->comment_author_url;
+        $url = esc_url( $author_url, array( 'http', 'https' ) );
+        $id = $comment->ID;
+    }
 
     /**
@@ -307 +312 @@
      * @param WP_Comment $comment    The comment object.
      */
-    return apply_filters( 'get_comment_author_url', $url, $comment->comment_ID, $comment );
+    return apply_filters( 'get_comment_author_url', $url, $id, $comment );
 }
 
@@ -346 +351 @@
  *
  * @since 1.5.0
- *
- * @param string $linktext Optional. The text to display instead of the comment
- *                         author's email address. Default empty.
- * @param string $before   Optional. The text or HTML to display before the email link.
- *                         Default empty.
- * @param string $after    Optional. The text or HTML to display after the email link.
- *                         Default empty.
+ * @since 4.6.0 The `$comment` parameter was added.
+ *
+ * @param string         $linktext Optional. The text to display instead of the comment
+ *                                 author's email address. Default empty.
+ * @param string         $before   Optional. The text or HTML to display before the email link.
+ *                                 Default empty.
+ * @param string         $after    Optional. The text or HTML to display after the email link.
+ *                                 Default empty.
+ * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
+ *                                 Default is the current comment.
  * @return string The HTML link between the $before and $after parameters.
  */
-function get_comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
-    $url = get_comment_author_url();
+function get_comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
+    $url = get_comment_author_url( $comment );
     $display = ($linktext != '') ? $linktext : $url;
     $display = str_replace( 'http://www.', '', $display );
@@ -381 +389 @@
  *
  * @since 0.71
- *
- * @param string $linktext Optional. Text to display instead of the comment author's
- *                         email address. Default empty.
- * @param string $before   Optional. Text or HTML to display before the email link.
- *                         Default empty.
- * @param string $after    Optional. Text or HTML to display after the email link.
- *                         Default empty.
- */
-function comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
-    echo get_comment_author_url_link( $linktext, $before, $after );
+ * @since 4.6.0 The `$comment` parameter was added.
+ *
+ * @param string         $linktext Optional. Text to display instead of the comment author's
+ *                                 email address. Default empty.
+ * @param string         $before   Optional. Text or HTML to display before the email link.
+ *                                 Default empty.
+ * @param string         $after    Optional. Text or HTML to display after the email link.
+ *                                 Default empty.
+ * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
+ *                                 Default is the current comment.
+ */
+function comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
+    echo get_comment_author_url_link( $linktext, $before, $after, $comment );
 }