Changeset 12797

Timestamp:

01/22/2010 06:27:54 PM (15 years ago)

Author:

ryan

Message:

Introduce set_current_screen(). Set current screen for inline edit ajax requests so post rows can be properly displayed. see #9674

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• admin.php (modified) (1 diff)
• includes/template.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -1100 +1100 @@
     }
 
+    if ( isset($_POST['screen']) )
+        set_current_screen($_POST['screen']);
+
     if ( $last = wp_check_post_lock( $post_ID ) ) {
         $last_user = get_userdata( $last );

trunk/wp-admin/admin.php

@@ -113 +113 @@
 // @todo validate typenow against post types.
 
-/**
- * Global object containing info about the current screen.
- */
-$current_screen = $hook_suffix;
-$current_screen = str_replace('.php', '', $current_screen);
-$current_screen = str_replace('-new', '', $current_screen);
-$current_screen = str_replace('-add', '', $current_screen);
-$current_screen = array('id' => $current_screen, 'base' => $current_screen);
-$current_screen = (object) $current_screen;
-if ( 'edit' == $current_screen->id ) {
-    if ( empty($typenow) )
-        $typenow = 'post';
-    $current_screen->id .= '-' . $typenow;
-    $current_screen->post_type = $typenow;
-} elseif ( 'post' == $current_screen->id ) {
-    if ( empty($typenow) )
-        $typenow = 'post';
-    $current_screen->id = $typenow;
-    $current_screen->post_type = $typenow;
-} else {
-    $typenow = '';
-}
-
-$current_screen = apply_filters('current_screen', $current_screen);
+set_current_screen();
 
 // Handle plugin admin pages.

trunk/wp-admin/includes/template.php

@@ -1266 +1266 @@
             <input accesskey="s" class="button-primary alignright" type="submit" name="bulk_edit" value="<?php echo esc_attr( $update_text ); ?>" />
         <?php } ?>
-        <input type="hidden" name="post_view" value="<?php echo $m; ?>" />
+        <input type="hidden" name="post_view" value="<?php echo esc_attr($m); ?>" />
+        <input type="hidden" name="screen" value="<?php echo esc_attr($screen->id); ?>" />
         <br class="clear" />
     </p>
@@ -3828 +3829 @@
 }
 
+/**
+ * Set the current screen object
+ *
+ * @since 3.0
+ *
+ * @uses $current_screen
+ * 
+ * @param string $id Screen id, optional.
+ */
+function set_current_screen( $id =  '' ) {
+    global $current_screen, $hook_suffix, $typenow;
+
+    if ( empty($id) ) {
+        $current_screen = $hook_suffix;
+        $current_screen = str_replace('.php', '', $current_screen);
+        $current_screen = str_replace('-new', '', $current_screen);
+        $current_screen = str_replace('-add', '', $current_screen);
+        $current_screen = array('id' => $current_screen, 'base' => $current_screen);
+    } else {
+        if ( false !== strpos($id, '-') )
+            list( $id, $typenow ) = explode('-', $id, 2);
+        $current_screen = array('id' => $id, 'base' => $id);
+    }
+    
+    $current_screen = (object) $current_screen;
+    
+    if ( 'edit' == $current_screen->id ) {
+        if ( empty($typenow) )
+            $typenow = 'post';
+        $current_screen->id .= '-' . $typenow;
+        $current_screen->post_type = $typenow;
+    } elseif ( 'post' == $current_screen->id ) {
+        if ( empty($typenow) )
+            $typenow = 'post';
+        $current_screen->id = $typenow;
+        $current_screen->post_type = $typenow;
+    } else {
+        $typenow = '';
+    }
+    
+    $current_screen = apply_filters('current_screen', $current_screen);
+}
+
 ?>