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

gallery · Sep 2, 2010 · af3d5ac · af3d5ac
2 parents 80e9fca + 1f621d9
commit af3d5ac
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
@@ -63,6 +63,8 @@ static function identity_provider_changed($old_provider, $new_provider) {
       ->update("logs")
       ->set("user_id", $admin->id)
       ->execute();
+    module::set_var("gallery", "email_from", $admin->email);
+    module::set_var("gallery", "email_reply_to", $admin->email);
   }
 
   static function group_created($group) {
@@ -547,4 +549,11 @@ static function show_user_profile($data) {
     $data->content[] = (object) array("title" => t("User information"), "view" => $v);
 
   }
+
+  static function user_change_email_form_completed($user, $form) {
+    if ($user->admin) {
+      module::set_var("gallery", "email_from", $user->email);
+      module::set_var("gallery", "email_reply_to", $user->email);
+    }
+  }
 }