diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index c26423347f..de3d814d9d 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -111,32 +111,26 @@ if ('view' == $mode) { $class .= ' alternate'; echo "
  • "; ?> -

    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 ' | comment_author, 1)) . "' );\">" . __('Delete') . ' '; - if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) { - echo ' | ' . __('Unapprove') . ' '; - echo ' | ' . __('Approve') . ' '; - } - echo " | comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by "%s".\\n"Cancel" to stop, "OK" to mark as spam."), wp_specialchars( $comment->comment_author, 1 )) . "' );\">" . __('Spam') . " ]"; - } // end if any comments to show - // Get post title - $post = get_post($comment->comment_post_ID); - $post_title = $post->post_title; - $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; - if ( 'page' == $post->post_type ) { - if ( current_user_can('edit_page', $comment->comment_post_ID) ) ?> - [ - comment_post_ID) ) ?> - [ - - | ]

    +

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

    • diff --git a/wp-admin/edit.php b/wp-admin/edit.php index f3d2009e1f..eac335b2ab 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -251,44 +251,39 @@ if ( 1 == count($posts) ) { if ($comments) { ?>

    -
      +
        comment_ID) ) - $class[] = 'unapproved'; -?> -
      1. > - - @ - - ID) ) { - echo "[ " . __('Edit') . ''; - echo ' - comment_author, 1)) . "' );\">" . __('Delete') . ' '; - if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) { - echo ' - ' . __('Unapprove') . ' '; - echo ' - ' . __('Approve') . ' '; - } - echo "]"; - } // end if any comments to show - ?> -
        - - - ( - - / - - ) (IP: - - ) - + ++$i; $class = ''; + $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID")); + $comment_status = wp_get_comment_status($comment->comment_ID); + if ('unapproved' == $comment_status) + $class .= ' unapproved'; + if ($i % 2) + $class .= ' alternate'; + echo "
      2. "; +?> +

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

        + + + +

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

        +
        3. - - '; diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php index 37ef7c006c..7c195f8f6a 100644 --- a/wp-admin/moderation.php +++ b/wp-admin/moderation.php @@ -144,16 +144,21 @@ $i = 0; else $class = ''; echo "\n\t
      3. "; ?> -

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

        +

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

        -

        comment_ID.'">' . __('Edit') . ' | ';?> - | -comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), wp_specialchars($comment->comment_author, 1)) . "' );\">" . __('Delete just this comment') . " | "; ?> - - - +

        — [ comment_ID.'">' . __('Edit') . ' | '; +echo " comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), wp_specialchars($comment->comment_author, 1)) . "' );\">" . __('Delete ') . " | "; ?> +comment_post_ID); +$post_title = wp_specialchars( $post->post_title, 'double' ); +$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; +?> + ] — + +   +   +  

        @@ -165,7 +170,7 @@ echo " comment_post_ID
        -

        +