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

Warning fixes 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9490 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-11-03 06:44:48 +00:00
parent 67d066669a
commit c31fcfdab3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/comment.php
View File

@ -155,9 +155,11 @@ function &get_comment(&$comment, $output = OBJECT) {
if ( $output == OBJECT ) { if ( $output == OBJECT ) {
return $_comment; return $_comment;
} elseif ( $output == ARRAY_A ) { } elseif ( $output == ARRAY_A ) {
return get_object_vars($_comment); $__comment = get_object_vars($_comment);
return $__comment;
} elseif ( $output == ARRAY_N ) { } elseif ( $output == ARRAY_N ) {
return array_values(get_object_vars($_comment)); $__comment = array_values(get_object_vars($_comment));
return $__comment;
} else { } else {
return $_comment; return $_comment;
} }
@ -778,7 +780,7 @@ function wp_transition_comment_status($new_status, $old_status, $comment) {
do_action('transition_comment_status', $new_status, $old_status, $comment); do_action('transition_comment_status', $new_status, $old_status, $comment);
do_action("comment_${old_status}_to_$new_status", $comment); do_action("comment_${old_status}_to_$new_status", $comment);
} }
do_action("comment_${new_status}_$comment->comment_type", $comment->ID, $comment); do_action("comment_${new_status}_$comment->comment_type", $comment->comment_ID, $comment);
} }
/** /**
@ -1076,6 +1078,7 @@ function wp_update_comment($commentarr) {
clean_comment_cache($comment_ID); clean_comment_cache($comment_ID);
wp_update_comment_count($comment_post_ID); wp_update_comment_count($comment_post_ID);
do_action('edit_comment', $comment_ID); do_action('edit_comment', $comment_ID);
$comment = get_comment($comment_ID);
wp_transition_comment_status($comment_approved, $comment->comment_approved, $comment); wp_transition_comment_status($comment_approved, $comment->comment_approved, $comment);
return $rval; return $rval;
} }