Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Post filter fixes from mdawaffe. fixes #5249

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@6287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-10-23 23:02:24 +00:00
parent 9db4d2042e
commit 1920dc0390
6 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/admin-ajax.php
View File

@ -15,7 +15,9 @@ switch ( $action = $_POST['action'] ) :
case 'add-post' :
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();
include( 'edit-post-rows.php' );

6
wp-admin/edit.php
View File

@ -108,8 +108,6 @@ if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?
<?php wp_dropdown_categories('show_option_all='.__('All').'&hide_empty=1&hierarchical=1&show_count=1&selected='.$cat);?>
</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>
<?php do_action('restrict_manage_posts'); ?>
@ -118,6 +116,10 @@ if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?
<?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>
<div class="navigation">

18
wp-admin/includes/post.php
View File

@ -476,10 +476,12 @@ function _relocate_children( $old_ID, $new_ID ) {
return $wpdb->query( "UPDATE $wpdb->posts SET post_parent = $new_ID WHERE post_parent = $old_ID" );
}
function wp_edit_posts_query( $q = '_GET' ) {
function wp_edit_posts_query( $q = false ) {
global $wpdb;
$$q['m'] = (int) $$q['m'];
$$q['cat'] = (int) $$q['cat'];
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')),
'future' => array(__('Scheduled'), __('Scheduled posts')),
@ -492,15 +494,15 @@ function wp_edit_posts_query( $q = '_GET' ) {
$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 ( 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 ( 'pending' === $q['post_status'] ) {
$order = 'ASC';
$orderby = 'modified';
} elseif ( 'draft' === $$q['post_status'] ) {
} elseif ( 'draft' === $q['post_status'] ) {
$order = 'DESC';
$orderby = 'modified';
} else {

2
wp-admin/js/edit-posts.js
View File

@ -6,7 +6,7 @@ if ( document.location.href.match(/(\?|&)c=/) )
else
delAfter = function() {
list[0].wpList.add( extra.children(':eq(0)').remove().clone() );
$('#get-extra-button').click();
$('#get-extra-posts').submit();
}
var addBefore = function ( settings ) {

3
wp-includes/js/wp-lists.js
View File

@ -282,9 +282,10 @@ var wpList = {
}
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 ); }
}, 705 );

4
wp-includes/script-loader.php
View File

@ -61,7 +61,7 @@ class WP_Scripts {
'delText' => __('Are you sure you want to delete this %thing%?')
) );
$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'
) );
@ -118,7 +118,7 @@ class WP_Scripts {
$this->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists'), '20070823' );
$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' );
$this->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' );