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

2 files changed, 22 insertions, 1 deletions

diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 2b651118..35685d8c 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -72,7 +72,7 @@ class comment_Core {
     $group->input("url")    ->label(t("Website (hidden)"))->id("g-url");
     $group->textarea("text")->label(t("Comment"))         ->id("g-text");
     $group->hidden("item_id")->value($item->id);
-    module::event("recaptcha_add", $group);
+    module::event("comment_add_form", $form);
     $group->submit("")->value(t("Add"))->class("ui-state-default ui-corner-all");
 
     $active = identity::active_user();
diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index 2199eb7f..ddf72e3c 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -22,6 +22,27 @@ class comment_event_Core {
     Database::instance()->delete("comments", array("item_id" => $item->id));
   }
 
+  static function user_deleted($user) {
+    $guest = identity::guest();
+    Database::instance()
+      ->query("UPDATE {comments}
+                  SET author_id = {$guest->id},
+                      guest_email = NULL,
+                      guest_name = 'guest',
+                      guest_url = NULL
+                WHERE author_id = {$user->id}");
+  }
+
+  static function identity_provider_changed($old_provider, $new_provider) {
+    $guest = identity::guest();
+    Database::instance()
+      ->query("UPDATE {comments}
+                  SET author_id = {$guest->id},
+                      guest_email = NULL,
+                      guest_name = 'guest',
+                      guest_url = null");
+  }
+
   static function admin_menu($menu, $theme) {
     $menu->get("content_menu")
       ->append(Menu::factory("link")