Changeset 15178

Timestamp:

06/09/2010 04:52:25 PM (16 years ago)

Author:

ryan

Message:

Set the screen for add-tag ajax requests. see #13783

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• edit-tags.php (modified) (1 diff)
• includes/template.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -576 +576 @@
     }
 
+    if ( isset($_POST['screen']) )
+        set_current_screen($_POST['screen']);
+
     $level = 0;
     $tag_full_name = false;

trunk/wp-admin/edit-tags.php

@@ -384 +384 @@
 <form id="addtag" method="post" action="edit-tags.php" class="validate">
 <input type="hidden" name="action" value="add-tag" />
+<input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->id); ?>" />
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
 <?php wp_nonce_field('add-tag'); ?>

trunk/wp-admin/includes/template.php

@@ -3910 +3910 @@
         $current_screen = array('id' => $current_screen, 'base' => $current_screen);
     } else {
-        if ( false !== strpos($id, '-') )
+        $id = sanitize_key($id);
+        if ( false !== strpos($id, '-') ) {
             list( $id, $typenow ) = explode('-', $id, 2);
+            if ( is_taxonomy($typenow) ) {
+                $id = 'edit-tags';
+                $taxnow = $typenow;
+                $typenow = '';
+            }
+        }
         $current_screen = array('id' => $id, 'base' => $id);
     }