WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert [8881], patch wasn't ready. see #7738 

git-svn-id: http://svn.automattic.com/wordpress/trunk@8882 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-09-13 18:18:44 +00:00
parent 32c9a1f7c4
commit 727c0fc3d5
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/includes/comment.php
View File

@ -106,15 +106,6 @@ function get_pending_comments_num( $post_id ) {
// Add avatars to relevant places in admin, or try to
add_action('admin_init', 'floated_admin_avatar_handler');
function floated_admin_avatar_handler() {
global $pagenow;
if ( 'edit-comments.php' == $pagenow || 'edit.php' == $pagenow ) {
if ( get_option('show_avatars') )
add_filter( 'comment_author', 'floated_admin_avatar' );
}
}
function floated_admin_avatar( $name ) {
global $comment;
@ -130,6 +121,11 @@ function floated_admin_avatar( $name ) {
return "$avatar $name";
}
if ( is_admin() && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
if ( get_option('show_avatars') )
add_filter( 'comment_author', 'floated_admin_avatar' );
}
function wp_get_inbox_items() {
$r = array();
$r[] = (object) array(