Changeset 28590

Timestamp:

05/27/2014 01:42:27 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Pass anchor text to 'edit_post_link' and 'edit_comment_link' filters.

props kwight.
fixes #28373.

File:

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

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

@@ -1197 +1197 @@
  * @since 1.0.0
  *
- * @param string $link Optional. Anchor text.
+ * @param string $text Optional. Anchor text.
  * @param string $before Optional. Display before edit link.
  * @param string $after Optional. Display after edit link.
  * @param int $id Optional. Post ID.
  */
-function edit_post_link( $link = null, $before = '', $after = '', $id = 0 ) {
-    if ( !$post = get_post( $id ) )
+function edit_post_link( $text = null, $before = '', $after = '', $id = 0 ) {
+    if ( ! $post = get_post( $id ) ) {
         return;
-
-    if ( !$url = get_edit_post_link( $post->ID ) )
+    }
+
+    if ( ! $url = get_edit_post_link( $post->ID ) ) {
         return;
-
-    if ( null === $link )
-        $link = __('Edit This');
-
-    $link = '<a class="post-edit-link" href="' . $url . '">' . $link . '</a>';
+    }
+
+    if ( null === $text ) {
+        $text = __( 'Edit This' );
+    }
+
+    $link = '<a class="post-edit-link" href="' . $url . '">' . $text . '</a>';
 
     /**
@@ -1221 +1224 @@
      * @param string $link    Anchor tag for the edit link.
      * @param int    $post_id Post ID.
-     */
-    echo $before . apply_filters( 'edit_post_link', $link, $post->ID ) . $after;
+     * @param string $text    Anchor text.
+     */
+    echo $before . apply_filters( 'edit_post_link', $link, $post->ID, $text ) . $after;
 }
 
@@ -1298 +1302 @@
  * @since 1.0.0
  *
- * @param string $link Optional. Anchor text.
+ * @param string $text Optional. Anchor text.
  * @param string $before Optional. Display before edit link.
  * @param string $after Optional. Display after edit link.
  */
-function edit_comment_link( $link = null, $before = '', $after = '' ) {
+function edit_comment_link( $text = null, $before = '', $after = '' ) {
     global $comment;
 
-    if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
+    if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
         return;
-
-    if ( null === $link )
-        $link = __('Edit This');
-
-    $link = '<a class="comment-edit-link" href="' . get_edit_comment_link( $comment->comment_ID ) . '">' . $link . '</a>';
+    }
+
+    if ( null === $text ) {
+        $text = __( 'Edit This' );
+    }
+
+    $link = '<a class="comment-edit-link" href="' . get_edit_comment_link( $comment->comment_ID ) . '">' . $text . '</a>';
 
     /**
@@ -1320 +1326 @@
      * @param string $link       Anchor tag for the edit link.
      * @param int    $comment_id Comment ID.
-     */
-    echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID ) . $after;
+     * @param string $text       Anchor text.
+     */
+    echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID, $text ) . $after;
 }