Changeset 15800

Timestamp:

10/14/2010 07:35:13 AM (16 years ago)

Author:

scribu

Message:

get_edit_term_link() improvements:

• add optional $object_type parameter
• make $term_id and $taxonomy parameters mandatory
• pass all relevant information to the filter
• use in WP_Terms_Table

See #9702

Location:

trunk

Files:

• wp-admin/includes/default-list-tables.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (3 diffs)

trunk/wp-admin/includes/default-list-tables.php

@@ -1655 +1655 @@
                 $name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
                 $qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
-                $edit_link = "edit-tags.php?action=edit&taxonomy=$taxonomy&post_type=$post_type&tag_ID=$tag->term_id";
+                $edit_link = get_edit_term_url( $tag->term_id, $taxonomy, $post_type );
 
                 $out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';

trunk/wp-includes/link-template.php

@@ -650 +650 @@
  *
  * @param int $tag_id Tag ID
- * @return string
- */
-function get_edit_tag_link( $tag_id = 0, $taxonomy = 'post_tag' ) {
+ * @param string $taxonomy Taxonomy
+ * @return string
+ */
+function get_edit_tag_link( $tag_id, $taxonomy = 'post_tag' ) {
         return apply_filters( 'get_edit_tag_link', get_edit_term_url( $tag_id, $taxonomy ) );
 }
@@ -678 +679 @@
  *
  * @param int $term_id Term ID
- * @param int $taxonomy Taxonomy
- * @return string
- */
-function get_edit_term_url( $term_id = 0, $taxonomy = 'post_tag' ) {
-        $tax = get_taxonomy($taxonomy);
-        if ( !current_user_can($tax->cap->edit_terms) )
-                return;
-
-        $term = get_term($term_id, $taxonomy);
-
-        $location = admin_url('edit-tags.php?action=edit&taxonomy=' . $taxonomy .'&tag_ID=' . $term->term_id);
-
-        return apply_filters( 'get_edit_term_url', $location );
+ * @param string $taxonomy Taxonomy
+ * @param string $object_type The object type
+ * @return string
+ */
+function get_edit_term_url( $term_id, $taxonomy, $object_type = '' ) {
+        $tax = get_taxonomy( $taxonomy );
+        if ( !current_user_can( $tax->cap->edit_terms ) )
+                return;
+
+        $term = get_term( $term_id, $taxonomy );
+
+        $args = array(
+                'action' => 'edit',
+                'taxonomy' => $taxonomy,
+                'tag_ID' => $term->term_id,
+        );
+
+        if ( $object_type )
+                $args['post_type'] = $object_type;
+
+        $location = add_query_arg( $args, admin_url( 'edit-tags.php' ) );
+
+        return apply_filters( 'get_edit_term_url', $location, $term_id, $taxonomy, $object_type );
 }
 
@@ -705 +716 @@
  */
 function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-        
-        if ( $term == null ) {
+        if ( is_null( $term ) ) {
                 global $wp_query;
                 $term = $wp_query->get_queried_object();
         }
-        
+
         $tax = get_taxonomy( $term->taxonomy );
         if ( !current_user_can($tax->cap->edit_terms) )
                 return;
 
-        if ( empty($link) )
+        if ( empty( $link ) )
                 $link = __('Edit This');
 
         $link = '<a href="' . get_edit_term_url( $term->term_id, $term->taxonomy ) . '" title="' . $link . '">' . $link . '</a>';
         $link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
-        
+
         if ( $echo )
                 echo $link;