Changeset 9490 for trunk/wp-includes/comment.php

Timestamp:

11/03/2008 06:44:48 AM (16 years ago)

Author:

ryan

Message:

Warning fixes

File:

• trunk/wp-includes/comment.php (modified) (3 diffs)

trunk/wp-includes/comment.php

@@ -156 +156 @@
         return $_comment;
     } elseif ( $output == ARRAY_A ) {
-        return get_object_vars($_comment);
+        $__comment = get_object_vars($_comment);
+        return $__comment;
     } elseif ( $output == ARRAY_N ) {
-        return array_values(get_object_vars($_comment));
+        $__comment = array_values(get_object_vars($_comment));
+        return $__comment;
     } else {
         return $_comment;
@@ -779 +781 @@
         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);
 }
 
@@ -1077 +1079 @@
     wp_update_comment_count($comment_post_ID);
     do_action('edit_comment', $comment_ID);
+    $comment = get_comment($comment_ID);
     wp_transition_comment_status($comment_approved, $comment->comment_approved, $comment);
     return $rval;