Show
Ignore:
Timestamp:
10/30/07 16:49:38 (1 year ago)
Author:
donncha
Message:

Merge with WordPress? 2.3.1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/edit.php

    r1130 r1139  
    44$title = __('Posts'); 
    55$parent_file = 'edit.php'; 
    6 wp_enqueue_script( 'admin-posts' ); 
    7 if ( 1 == $_GET['c'] ) 
    8         wp_enqueue_script( 'admin-comments' ); 
     6wp_enqueue_script( 1 == $_GET['c'] ? 'admin-comments' : 'listman' ); 
    97require_once('admin-header.php'); 
    108 
    11 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; return "LIMIT $start, 20";' ) ); 
    12 list($post_stati, $avail_post_stati) = wp_edit_posts_query(); 
    13 $wp_query->max_num_pages = ceil( $wp_query->found_posts / 15 ); // We grab 20 but only show 15 ( 5 more for ajax extra ) 
     9$_GET['m']   = (int) $_GET['m']; 
     10$_GET['cat'] = (int) $_GET['cat']; 
     11$post_stati  = array(   //      array( adj, noun ) 
     12                        'publish' => array(__('Published'), __('Published posts')), 
     13                        'future' => array(__('Scheduled'), __('Scheduled posts')), 
     14                        'pending' => array(__('Pending Review'), __('Pending posts')), 
     15                        'draft' => array(__('Draft'), _c('Drafts|manage posts header')), 
     16                        'private' => array(__('Private'), __('Private posts')) 
     17                ); 
     18 
     19$avail_post_stati = $wpdb->get_col("SELECT DISTINCT post_status FROM $wpdb->posts WHERE post_type = 'post'"); 
     20 
     21$post_status_q = ''; 
     22$post_status_label = __('Posts'); 
     23if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) { 
     24        $post_status_label = $post_stati[$_GET['post_status']][1]; 
     25        $post_status_q = '&post_status=' . $_GET['post_status']; 
     26} 
    1427?> 
    1528 
    …… 
    1831<?php 
    1932 
    20 $posts_columns = wp_manage_posts_columns(); 
     33if ( 'pending' === $_GET['post_status'] ) { 
     34        $order = 'ASC'; 
     35        $orderby = 'modified'; 
     36} elseif ( 'draft' === $_GET['post_status'] ) { 
     37        $order = 'DESC'; 
     38        $orderby = 'modified'; 
     39} else { 
     40        $order = 'DESC'; 
     41        $orderby = 'date'; 
     42} 
     43 
     44wp("what_to_show=posts$post_status_q&posts_per_page=15&order=$order&orderby=$orderby"); 
     45 
     46// define the columns to display, the syntax is 'internal name' => 'display name' 
     47$posts_columns = array(); 
     48$posts_columns['id'] = '<div style="text-align: center">' . __('ID') . '</div>'; 
     49if ( 'draft' === $_GET['post_status'] ) 
     50        $posts_columns['modified'] = __('Modified'); 
     51elseif ( 'pending' === $_GET['post_status'] ) 
     52        $posts_columns['modified'] = __('Submitted'); 
     53else 
     54        $posts_columns['date'] = __('When'); 
     55$posts_columns['title'] = __('Title'); 
     56$posts_columns['categories'] = __('Categories'); 
     57if ( !in_array($_GET['post_status'], array('pending', 'draft', 'future')) ) 
     58        $posts_columns['comments'] = '<div style="text-align: center">' . __('Comments') . '</div>'; 
     59$posts_columns['author'] = __('Author'); 
     60 
     61$posts_columns = apply_filters('manage_posts_columns', $posts_columns); 
     62 
     63// you can not edit these at the moment 
     64$posts_columns['control_view']   = ''; 
     65$posts_columns['control_edit']   = ''; 
     66$posts_columns['control_delete'] = ''; 
    2167 
    2268?> 
    …… 
    117163<?php include( 'edit-post-rows.php' ); ?> 
    118164 
    119 <form action="" method="post" id="get-extra-posts" class="add:the-extra-list:" style="display:none"> 
    120         <?php wp_nonce_field( 'add-post', '_ajax_nonce', false ); ?> 
    121 </form> 
    122  
    123165<div id="ajax-response"></div> 
    124166 
    …… 
    134176        $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date"); 
    135177        if ($comments) { 
    136                 // Make sure comments, post, and post_author are cached 
    137178                update_comment_cache($comments); 
    138                 $post = get_post($id); 
    139                 $authordata = get_userdata($post->post_author); 
    140179        ?> 
    141180<h3 id="comments"><?php _e('Comments') ?></h3> 
    142 <ol id="the-comment-list" class="list:comment commentlist"> 
    143 <?php 
    144                 $i = 0; 
    145                 foreach ( $comments as $comment ) { 
    146                         _wp_comment_list_item( $comment->comment_ID, ++$i ); 
    147                 } 
     181<ol id="the-comment-list" class="commentlist"> 
     182<?php 
     183$i = 0; 
     184foreach ($comments as $comment) { 
     185 
     186                ++$i; $class = ''; 
     187                $post = get_post($comment->comment_post_ID); 
     188                $authordata = get_userdata($post->post_author); 
     189                        $comment_status = wp_get_comment_status($comment->comment_ID); 
     190                        if ('unapproved' == $comment_status) 
     191                                $class .= ' unapproved'; 
     192                        if ($i % 2) 
     193                                $class .= ' alternate'; 
     194                        echo "<li id='comment-$comment->comment_ID' class='$class'>"; 
     195?> 
     196<p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=edit"><?php comment_author_IP() ?></a></p> 
     197 
     198<?php comment_text() ?> 
     199 
     200<p><?php comment_date(__('M j, g:i A')); ?> &#8212; [ 
     201<?php 
     202if ( current_user_can('edit_post', $comment->comment_post_ID) ) { 
     203        echo " <a href='comment.php?action=editcomment&amp;c=".$comment->comment_ID."'>" . __('Edit') . '</a>'; 
     204        echo ' | <a href="' . wp_nonce_url('comment.php?action=deletecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . js_escape(sprintf(__("You are about to delete this comment by '%s'.\n'Cancel' to stop, 'OK' to delete."), $comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> '; 
     205        if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) { 
     206                echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>'; 
     207                echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>'; 
     208        } 
     209        echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&amp;dt=spam&amp;p=" . $comment->comment_post_ID . "&amp;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') . "</a> "; 
     210} 
     211?> ] 
     212</p> 
     213                </li> 
     214 
     215<?php //end of the loop, don't delete 
     216                } // end foreach 
    148217        echo '</ol>'; 
    149         } // end if comments 
    150 ?> 
     218        }//end if comments 
     219       ?> 
    151220<?php } ?> 
    152221</div>