diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-09-01 22:00:40 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-09-01 22:00:40 -0700 |
| commit | af3d5acbcd5df6da8e532a009d5be6ba6d1cca0d (patch) | |
| tree | ef93a976839c5de54b0ac8e1cf1fb675f5aa1148 /modules | |
| parent | 80e9fcaf47af6a041db385f18b0be00c15708da7 (diff) | |
| parent | 1f621d9827040d9730946a5804dd3d7269198ccc (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gallery/helpers/gallery_event.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php index df5394c9..66b250e9 100644 --- a/modules/gallery/helpers/gallery_event.php +++ b/modules/gallery/helpers/gallery_event.php @@ -63,6 +63,8 @@ class gallery_event_Core { ->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 @@ class gallery_event_Core { $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); + } + } } |