Changeset 9340

Timestamp:

10/25/2008 06:19:42 PM (16 years ago)

Author:

ryan

Message:

Introduce get_edit_tag_link() and add option to wp_tag_cloud() for showing edit links.

Location:

trunk

Files:

• wp-admin/edit-tags.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (2 diffs)
• wp-includes/link-template.php (modified) (3 diffs)

trunk/wp-admin/edit-tags.php

@@ -274 +274 @@
 <div class="tagcloud">
 <h3><?php _e('Popular Tags'); ?></h3>
-<?php wp_tag_cloud(); ?>
+<?php wp_tag_cloud(array('link' => 'edit')); ?>
 </div>
 

trunk/wp-includes/category-template.php

@@ -552 +552 @@
         'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 45,
         'format' => 'flat', 'orderby' => 'name', 'order' => 'ASC',
-        'exclude' => '', 'include' => ''
+        'exclude' => '', 'include' => '', 'link' => 'view'
     );
     $args = wp_parse_args( $args, $defaults );
@@ -562 +562 @@
 
     foreach ( $tags as $key => $tag ) {
-        $link = get_tag_link( $tag->term_id );
+        if ( 'edit' == $args['link'] )
+            $link = get_edit_tag_link( $tag->term_id );
+        else
+            $link = get_tag_link( $tag->term_id );
         if ( is_wp_error( $link ) )
             return false;

trunk/wp-includes/link-template.php

@@ -557 +557 @@
 
     return $link;
+}
+
+/**
+ * Retrieve edit tag link.
+ *
+ * @since 2.7.0
+ *
+ * @param int $tag_id Tag ID
+ * @return string
+ */
+function get_edit_tag_link( $tag_id = 0 ) {
+    $tag = get_term($tag_id, 'post_tag');
+
+    if ( !current_user_can('manage_categories') )
+        return;
+
+    $location = admin_url('edit-tags.php?action=edit&tag_ID=') . $tag->term_id;
+    return apply_filters( 'get_edit_tag_link', $location );
+}
+
+/**
+ * Display or retrieve edit tag link with formatting.
+ *
+ * @since 2.7.0
+ *
+ * @param string $link Optional. Anchor text.
+ * @param string $before Optional. Display before edit link.
+ * @param string $after Optional. Display after edit link.
+ * @param int|object $tag Tag object or ID
+ * @return string|null HTML content, if $echo is set to false.
+ */
+function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) {
+    $tag = get_term($tag, 'post_tag');
+
+    if ( !current_user_can('manage_categories') )
+        return;
+
+    if ( empty($link) )
+        $link = __('Edit This');
+
+    $link = '<a href="' . get_edit_tag_link( $tag->term_id ) . '" title="' . __( 'Edit tag' ) . '">' . $link . '</a>';
+    echo $before . apply_filters( 'edit_tag_link', $link, $tag->term_id ) . $after;
 }
 
@@ -717 +759 @@
  * @param string $before Optional. Display before edit link.
  * @param string $after Optional. Display after edit link.
- * @param bool $echo Optional, defaults to true. Whether to echo or return HTML.
  * @return string|null HTML content, if $echo is set to false.
  */
-function edit_comment_link( $link = 'Edit This', $before = '', $after = '', $echo = true ) {
+function edit_comment_link( $link = 'Edit This', $before = '', $after = '' ) {
     global $comment, $post;
 
@@ -733 +774 @@
 
     $link = '<a href="' . get_edit_comment_link( $comment->comment_ID ) . '" title="' . __( 'Edit comment' ) . '">' . $link . '</a>';
-    $link = $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID ) . $after;
-    if ( $echo )
-        echo $link;
-    else
-        return $link;
+    echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID ) . $after;
 }