Hopefully the third and final patch for #1216. Set the default from and reply-to addresses to an empty string. The first time the user model is saved, set the sendmail from and reply-to addresses. Requires an update to gallery version 38.

1 files changed, 7 insertions, 4 deletions

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 66b250e9..8344c11c 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -550,10 +550,13 @@ class gallery_event_Core {
 
   }
 
-  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);
+  static function user_updated($original_user, $updated_user) {
+    if ($updated_user->admin) {
+      $email = module::get_var("gallery", "email_from", "");
+      if (empty($email)) {
+        module::set_var("gallery", "email_from", $updated_user->email);
+        module::set_var("gallery", "email_reply_to", $updated_user->email);
+      }
     }
   }
 }