Merge branch 'master' of git://github.com/gallery/gallery3

2 files changed, 6 insertions, 3 deletions

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index 880c33a7..b7dc5fb3 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -121,9 +121,10 @@ class Admin_Comments_Controller extends Admin_Controller {
   public function delete_all_spam() {
     access::verify_csrf();
 
-    ORM::factory("comment")
+    db::build()
+      ->delete("comments")
       ->where("state", "=", "spam")
-      ->delete_all();
+      ->execute();
     url::redirect("admin/comments/queue/spam");
   }
 }
diff --git a/modules/comment/models/comment.php b/modules/comment/models/comment.php
index 59b85233..e0b82039 100644
--- a/modules/comment/models/comment.php
+++ b/modules/comment/models/comment.php
@@ -65,12 +65,14 @@ class Comment_Model extends ORM {
       }
     }
     $visible_change = $this->original()->state == "published" || $this->state == "published";
+
+    $original = clone $this->original();
     parent::save();
 
     if (isset($created)) {
       module::event("comment_created", $this);
     } else {
-      module::event("comment_updated", $this->original(), $this);
+      module::event("comment_updated", $original, $this);
     }
 
     // We only notify on the related items if we're making a visible change.