Show
Ignore:
Timestamp:
10/12/07 16:21:15 (1 year ago)
Author:
donncha
Message:

Merge with WP 2.3 - testing use only!
Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/edit-form-comment.php

    r1005 r1069  
    77 
    88<form name="post" action="comment.php" method="post" id="post"> 
     9<h2><?php echo $toprow_title; ?></h2> 
    910<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?> 
    1011<div class="wrap"> 
    …… 
    3334        <legend><label for="newcomment_author_url"><?php _e('URL:') ?></label></legend> 
    3435                <div> 
    35                   <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="3" /> 
     36                  <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="2" /> 
    3637    </div> 
    3738</fieldset> 
    …… 
    5455        <tr> 
    5556                <th scope="row" valign="top"><?php _e('Comment Status') ?>:</th> 
    56                 <td><label for="comment_status_approved" class="selectit"><input id="comment_status_approved" name="comment_status" type="radio" value="1" <?php checked($comment->comment_approved, '1'); ?> /> <?php _e('Approved') ?></label><br /> 
    57                 <label for="comment_status_moderated" class="selectit"><input id="comment_status_moderated" name="comment_status" type="radio" value="0" <?php checked($comment->comment_approved, '0'); ?> /> <?php _e('Moderated') ?></label><br /> 
    58                 <label for="comment_status_spam" class="selectit"><input id="comment_status_spam" name="comment_status" type="radio" value="spam" <?php checked($comment->comment_approved, 'spam'); ?> /> <?php _e('Spam') ?></label></td> 
     57                <td><label for="comment_status_approved" class="selectit"><input id="comment_status_approved" name="comment_status" type="radio" value="1" <?php checked($comment->comment_approved, '1'); ?> tabindex="4" /> <?php _e('Approved') ?></label> &nbsp; 
     58                <label for="comment_status_moderated" class="selectit"><input id="comment_status_moderated" name="comment_status" type="radio" value="0" <?php checked($comment->comment_approved, '0'); ?> tabindex="4" /> <?php _e('Moderated') ?></label> &nbsp; 
     59                <label for="comment_status_spam" class="selectit"><input id="comment_status_spam" name="comment_status" type="radio" value="spam" <?php checked($comment->comment_approved, 'spam'); ?> tabindex="4" /> <?php _e('Spam') ?></label></td> 
    5960        </tr> 
    6061 
    …… 
    6263        <tr> 
    6364                <th scope="row" valign="top"><?php _e('Edit time'); ?>:</th> 
    64                 <td><?php touch_time(('editcomment' == $action), 0); ?> </td> 
     65                <td><?php touch_time(('editcomment' == $action), 0, 5); ?> </td> 
    6566        </tr> 
    6667<?php endif; ?> 
    6768 
    6869        <tr> 
    69                 <th scope="row" valign="top"><?php _e('Delete'); $delete_nonce = wp_create_nonce( 'delete-comment_' . $comment->comment_ID ); ?>:</th> 
    70                 <td><input name="deletecomment" class="button delete" type="submit" id="deletecomment" tabindex="10" value="<?php _e('Delete this comment') ?>" <?php echo "onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true; } return false;\""; ?> />  
     70                <th scope="row" valign="top">&nbsp;</th> 
     71                <td><input name="deletecomment" class="button delete" type="submit" id="deletecomment" tabindex="10" value="<?php _e('Delete this comment') ?>" <?php echo "onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { document.forms.post._wpnonce.value = '" . wp_create_nonce( 'delete-comment_' . $comment->comment_ID ) . "'; return true; } return false;\""; ?> /> 
    7172                <input type="hidden" name="c" value="<?php echo $comment->comment_ID ?>" /> 
    7273                <input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" />