Changeset 6287

Timestamp:

10/23/2007 11:02:24 PM (18 years ago)

Author:

ryan

Message:

Post filter fixes from mdawaffe. fixes #5249

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/edit.php (modified) (2 diffs)
• wp-admin/includes/post.php (modified) (2 diffs)
• wp-admin/js/edit-posts.js (modified) (1 diff)
• wp-includes/js/wp-lists.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -16 +16 @@
     check_ajax_referer( 'add-post' );
     add_filter( 'post_limits', $limit_filter = create_function( '$a', '$b = split(" ",$a); if ( !isset($b[2]) ) return $a; $start = intval(trim($b[1])) / 20 * 15; if ( !is_int($start) ) return $a; $start += intval(trim($b[2])) - 1; return "LIMIT $start, 1";' ) );
-    wp_edit_posts_query( '_POST' );
+    wp_edit_posts_query( $_POST );
+    if ( !have_posts() )
+        die('1');
     $posts_columns = wp_manage_posts_columns();
     ob_start();

trunk/wp-admin/edit.php

@@ -109 +109 @@
     </fieldset>
     <input type="submit" id="post-query-submit" value="<?php _e('Filter &#187;'); ?>" class="button" />
-    <?php wp_nonce_field( 'add-post', '_ajax_nonce', false ); ?>
-    <input type="button" id="get-extra-button" class="add:the-extra-list:searchform" style="display:none" />
 </form>
 
@@ -118 +116 @@
 
 <?php include( 'edit-post-rows.php' ); ?>
+
+<form action="" method="post" id="get-extra-posts" class="add:the-extra-list:" style="display:none">
+    <?php wp_nonce_field( 'add-post', '_ajax_nonce', false ); ?>
+</form>
 
 <div id="ajax-response"></div>

trunk/wp-admin/includes/post.php

@@ -477 +477 @@
 }
 
-function wp_edit_posts_query( $q = '_GET' ) {
-    global $wpdb;
-    $$q['m']   = (int) $$q['m'];
-    $$q['cat'] = (int) $$q['cat'];
+function wp_edit_posts_query( $q = false ) {
+    global $wpdb;
+    if ( false === $q )
+        $q = $_GET;
+    $q['m']   = (int) $q['m'];
+    $q['cat'] = (int) $q['cat'];
     $post_stati  = array(   //  array( adj, noun )
                 'draft' => array(__('Draft'), _c('Drafts|manage posts header')),
@@ -493 +495 @@
     $post_status_q = '';
     $post_status_label = _c('Posts|manage posts header');
-    if ( isset($$q['post_status']) && in_array( $$q['post_status'], array_keys($post_stati) ) ) {
-        $post_status_label = $post_stati[$$q['post_status']][1];
-        $post_status_q = '&post_status=' . $$q['post_status'];
-    }
-
-    if ( 'pending' === $$q['post_status'] ) {
+    if ( isset($q['post_status']) && in_array( $q['post_status'], array_keys($post_stati) ) ) {
+        $post_status_label = $post_stati[$q['post_status']][1];
+        $post_status_q = '&post_status=' . $q['post_status'];
+    }
+
+    if ( 'pending' === $q['post_status'] ) {
         $order = 'ASC';
         $orderby = 'modified';
-    } elseif ( 'draft' === $$q['post_status'] ) {
+    } elseif ( 'draft' === $q['post_status'] ) {
         $order = 'DESC';
         $orderby = 'modified';

trunk/wp-admin/js/edit-posts.js

@@ -7 +7 @@
     delAfter = function() {
         list[0].wpList.add( extra.children(':eq(0)').remove().clone() );
-        $('#get-extra-button').click();
+        $('#get-extra-posts').submit();
     }
 

trunk/wp-includes/js/wp-lists.js

@@ -283 +283 @@
 
         if ( 'none' != s.addColor ) {
+            var b = e.css( 'background-color' );
+            if ( b == 'transparent' ) { b = ''; }
             Fat.fade_element(e.attr('id'),null,700,s.addColor);
             setTimeout( function() {
-                var b = e.css( 'background-color' );
                 var g = e.css( 'background-color', '' ).css( 'background-color' );
                 if ( b != g ) { e.css( 'background-color', b ); }

trunk/wp-includes/script-loader.php

@@ -62 +62 @@
         ) );
 
-        $this->add( 'wp-lists', '/wp-includes/js/wp-lists.js', array('jquery'), '20070823' );
+        $this->add( 'wp-lists', '/wp-includes/js/wp-lists.js', array('jquery'), '20071023' );
         $this->localize( 'wp-lists', 'wpListL10n', array(
             'url' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php'
@@ -119 +119 @@
             $this->add( 'admin-custom-fields', '/wp-admin/js/custom-fields.js', array('wp-lists'), '20070823' );
             $this->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists'), '20070822' );
-            $this->add( 'admin-posts', '/wp-admin/js/edit-posts.js', array('wp-lists'), '20070823' );
+            $this->add( 'admin-posts', '/wp-admin/js/edit-posts.js', array('wp-lists'), '20071023' );
             $this->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20070823' );
             $this->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );