From 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 12 Oct 2007 16:21:15 +0000 Subject: Merge with WP 2.3 - testing use only! Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/edit.php | 339 +++++++++++++++++++++--------------------------------- 1 file changed, 128 insertions(+), 211 deletions(-) (limited to 'wp-admin/edit.php') diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 47f5ad8..ba4cc04 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -6,134 +6,58 @@ $parent_file = 'edit.php'; wp_enqueue_script( 1 == $_GET['c'] ? 'admin-comments' : 'listman' ); require_once('admin-header.php'); -$_GET['m'] = (int) $_GET['m']; - -$drafts = get_users_drafts( $user_ID ); -$other_drafts = get_others_drafts( $user_ID); - -if ($drafts || $other_drafts) { +$_GET['m'] = (int) $_GET['m']; +$_GET['cat'] = (int) $_GET['cat']; +$post_stati = array( // array( adj, noun ) + 'publish' => array(__('Published'), __('Published posts')), + 'future' => array(__('Scheduled'), __('Scheduled posts')), + 'pending' => array(__('Pending Review'), __('Pending posts')), + 'draft' => array(__('Draft'), _c('Drafts|manage posts header')), + 'private' => array(__('Private'), __('Private posts')) + ); + +$avail_post_stati = $wpdb->get_col("SELECT DISTINCT post_status FROM $wpdb->posts WHERE post_type = 'post'"); + +$post_status_q = ''; +$post_status_label = __('Posts'); +if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) { + $post_status_label = $post_stati[$_GET['post_status']][1]; + $post_status_q = '&post_status=' . $_GET['post_status']; +} ?> -
- -

- post_title = apply_filters('the_title', stripslashes($draft->post_title)); - if ($draft->post_title == '') - $draft->post_title = sprintf(__('Post #%s'), $draft->ID); - echo "$draft->post_title"; - ++$i; - } - ?> -.

- - - -

- post_title = apply_filters('the_title', stripslashes($draft->post_title)); - if ($draft->post_title == '') - $draft->post_title = sprintf(__('Post #%s'), $draft->ID); - echo "$draft->post_title"; - ++$i; - } - ?> - .

- - - -
-
-

-post_title)); - elseif ( ! is_paged() || get_query_var('paged') == 1 ) - _e('Last 15 Posts'); - else - _e('Previous Posts'); + $order = 'DESC'; + $orderby = 'date'; } -?> -

-
-
- - - -
-
+wp("what_to_show=posts$post_status_q&posts_per_page=15&order=$order&orderby=$orderby"); -get_results("SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'post' ORDER BY post_date DESC"); - -if ( count($arc_result) ) { ?> - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
- - 'display name' -$posts_columns = array( - 'id' => '
' . __('ID') . '
', - 'date' => __('When'), - 'title' => __('Title'), - 'categories' => __('Categories'), - 'comments' => '
' . __('Comments') . '
', - 'author' => __('Author') -); +$posts_columns = array(); +$posts_columns['id'] = '
' . __('ID') . '
'; +if ( 'draft' === $_GET['post_status'] ) + $posts_columns['modified'] = __('Modified'); +elseif ( 'pending' === $_GET['post_status'] ) + $posts_columns['modified'] = __('Submitted'); +else + $posts_columns['date'] = __('When'); +$posts_columns['title'] = __('Title'); +$posts_columns['categories'] = __('Categories'); +if ( !in_array($_GET['post_status'], array('pending', 'draft', 'future')) ) + $posts_columns['comments'] = '
' . __('Comments') . '
'; +$posts_columns['author'] = __('Author'); + $posts_columns = apply_filters('manage_posts_columns', $posts_columns); // you can not edit these at the moment @@ -143,109 +67,100 @@ $posts_columns['control_delete'] = ''; ?> - - - +

post_title)); +} else { + if ( $post_listing_pageable && !is_archive() && !is_search() ) + $h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_status_label) : sprintf(__('Latest %s'), $post_status_label); + else + $h2_noun = $post_status_label; + // Use $_GET instead of is_ since they can override each other + $h2_author = ''; + $_GET['author'] = (int) $_GET['author']; + if ( $_GET['author'] != 0 ) { + if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion + $h2_author = ' ' . __('by other authors'); + } else { + $author_user = get_userdata( get_query_var( 'author' ) ); + $h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name )); + } + } + $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching “%s”'), wp_specialchars( get_search_query() ) ) : ''; + $h2_cat = isset($_GET['cat']) && $_GET['cat'] ? ' ' . sprintf( __('in “%s”'), single_cat_title('', false) ) : ''; + $h2_month = isset($_GET['m']) && $_GET['m'] ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : ''; + printf( _c( '%1$s%2$s%3$s%4$s%5$s|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_month ); +} +?>

- - - + +
+ +
+ +
+ +
- - - 1 ) : ?> - +
+ $editable_ids, 'show_option_all' => __('Any'), 'name' => 'author', 'selected' => isset($_GET['author']) ? $_GET['author'] : 0) ); ?> +
$column_display_name) { +$arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'post' ORDER BY post_date DESC"; - switch($column_name) { +$arc_result = $wpdb->get_results( $arc_query ); - case 'id': - ?> - - - - - - mmonth ) ) { ?> - case 'categories': - ?> - +
+
- yyear . $arc_row->mmonth == $_GET['m'] ) + $default = ' selected="selected"'; + else + $default = ''; - case 'author': + echo ""; + echo $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear"; + echo "\n"; + } ?> - - + - case 'control_view': - ?> - - - case 'control_edit': - ?> - - + + + + - case 'control_delete': - ?> - - - default: - ?> - - - - - - - - - -
post_modified ) _e('Unpublished'); else the_time(__('Y-m-d \<\b\r \/\> g:i:s a')); ?> - post_status) _e(' - Private'); ?> - " . __('1') . '', "" . __('%') . '') ?> - ID) ) { echo "" . __('Edit') . ""; } ?>ID) ) { echo "ID) . "' class='delete' onclick=\"return deleteSomething( 'post', " . $id . ", '" . js_escape(sprintf(__("You are about to delete this post '%s'.\n'OK' to delete, 'Cancel' to stop."), get_the_title())) . "' );\">" . __('Delete') . ""; } ?>
+
+ +
@@ -255,10 +170,12 @@ endwhile;
get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date"); if ($comments) { + update_comment_cache($comments); ?>

    @@ -267,7 +184,8 @@ $i = 0; foreach ($comments as $comment) { ++$i; $class = ''; - $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID")); + $post = get_post($comment->comment_post_ID); + $authordata = get_userdata($post->post_author); $comment_status = wp_get_comment_status($comment->comment_ID); if ('unapproved' == $comment_status) $class .= ' unapproved'; @@ -275,22 +193,22 @@ foreach ($comments as $comment) { $class .= ' alternate'; echo "
  1. "; ?> -

    comment_author_email) { ?>| comment_author_url && 'http://' != $comment->comment_author_url) { ?> | |

    +

    comment_author_email) { ?>| comment_author_url && 'http://' != $comment->comment_author_url) { ?> | |

    -

    — [ +

    — [ comment_post_ID) ) { - echo " " . __('Edit') . ''; + echo " " . __('Edit') . ''; echo ' | comment_author)) . "', theCommentList );\">" . __('Delete') . ' '; if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) { echo ' | ' . __('Unapprove') . ' '; echo ' | ' . __('Approve') . ' '; } - echo " | comment_post_ID . "&c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . " "; + echo " | comment_post_ID . "&c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . " "; } -?> +?> ]

    2. @@ -301,6 +219,5 @@ if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?> - + + -- cgit