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-comments.php

    r1125 r1139  
    103103                $start = " start='$offset'"; 
    104104 
    105                 echo "<ol id='the-comment-list' class='list:comment commentlist' $start>\n"; 
     105                echo "<ol id='the-comment-list' class='commentlist' $start>\n"; 
    106106                $i = 0; 
    107107                foreach ( $comments as $comment ) { 
     108                        get_comment( $comment ); // Cache it 
    108109                        _wp_comment_list_item( $comment->comment_ID, ++$i ); 
    109110                } 
    …… 
    112113if ( $extra_comments ) : ?> 
    113114<div id="extra-comments" style="display:none"> 
    114 <ol id="the-extra-comment-list" class="list:comment commentlist" style="color:red"> 
     115<ul id="the-extra-comment-list" class="commentlist"> 
    115116<?php 
    116117        foreach ( $extra_comments as $comment ) { 
    117118                get_comment( $comment ); // Cache it 
    118                 _wp_comment_list_item( $comment->comment_ID, 0 ); 
    119         } 
    120 ?> 
    121 </ol> 
    122 <form action="" method="get" id="get-extra-comments" class="add:the-extra-comment-list:"> 
    123 <input type="hidden" name="page" value="<?php echo $page; ?>" /> 
    124 <input type="hidden" name="s" value="<?php echo attribute_escape(@$_GET['s']); ?>" /> 
    125 <?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?> 
     119                _wp_comment_list_item( $comment->comment_ID, ++$i ); 
     120        } 
     121?> 
     122</ul> 
    126123</div> 
    127124<?php endif; // $extra_comments ?> 
    …… 
    153150        <th scope="col" colspan="3" style="text-align: center">' .  __('Actions') . '</th> 
    154151  </tr> 
    155 </thead> 
    156 <tbody id="the-comment-list" class="list:comment">'; 
     152</thead>'; 
    157153                foreach ($comments as $comment) { 
    158154                $post = get_post($comment->comment_post_ID); 
    …… 
    164160  <tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'> 
    165161    <td style="text-align: center"><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td> 
    166     <td class="comment-author"><?php comment_author_link() ?></td> 
     162    <td><?php comment_author_link() ?></td> 
    167163    <td><?php comment_author_email_link() ?></td> 
    168164    <td><a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=edit"><?php comment_author_IP() ?></a></td> 
    …… 
    178174        echo "<a href='comment.php?action=editcomment&amp;c=$comment->comment_ID' class='edit'>" .  __('Edit') . "</a>"; } ?></td> 
    179175    <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { 
    180                 $url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) ); 
    181                 echo "<a href='$url' class='delete:the-comment-list:comment-$comment->comment_ID delete'>" . __('Delete') . "</a> "; 
     176                echo "<a href=\"comment.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;c=".$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 );\" class='delete'>" . __('Delete') . "</a> "; 
    182177                } ?></td> 
    183178  </tr> 
    184179                <?php 
    185180                } // end foreach 
    186         ?></tbody> 
    187 </table> 
     181        ?></table> 
    188182<p class="submit"><input type="submit" name="delete_button" class="delete" value="<?php _e('Delete Checked Comments &raquo;') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php echo js_escape(__("Please select some comments to delete")); ?>'); return false } return confirm('<?php echo sprintf(js_escape(__("You are about to delete %s comments permanently \n  'Cancel' to stop, 'OK' to delete.")), "' + numchecked + '"); ?>')" /> 
    189183                        <input type="submit" name="spam_button" value="<?php _e('Mark Checked Comments as Spam &raquo;') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php echo js_escape(__("Please select some comments to mark as spam")); ?>'); return false } return confirm('<?php echo sprintf(js_escape(__("You are about to mark %s comments as spam \n  'Cancel' to stop, 'OK' to mark as spam.")), "' + numchecked + '"); ?>')" /></p>