diff options
| author | plegall <plg@piwigo.org> | 2010-03-13 00:00:52 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2010-03-13 00:00:52 +0000 |
| commit | 14778ce673277f2df41f963aa70df1cbed427294 (patch) | |
| tree | 8c723d4d9827876dbf19d2bd581405fc50910860 /admin/include | |
| parent | c396f08708d431c6f7e8656eaca4fd8e440fdd39 (diff) | |
feature 1502: based on Dotclear model, P@t has reorganized the way Piwigo
manages template/theme in a simpler "theme only level" architecture. It
supports multiple level inheritance.
git-svn-id: http://piwigo.org/svn/trunk@5123 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/include/functions_notification_by_mail.inc.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php index 35a83f616..5771c4d1d 100644 --- a/admin/include/functions_notification_by_mail.inc.php +++ b/admin/include/functions_notification_by_mail.inc.php @@ -256,11 +256,8 @@ function set_user_on_env_nbm(&$nbm_user, $is_action_send) if ($is_action_send) { - $nbm_user['template'] = $user['template']; $nbm_user['theme'] = $user['theme']; - $env_nbm['mail_template'] = - get_mail_template($env_nbm['email_format'], - array('template' => $nbm_user['template'], 'theme' => $nbm_user['theme'])); + $env_nbm['mail_template'] = get_mail_template($env_nbm['email_format'], $nbm_user['theme']); $env_nbm['mail_template']->set_filename('notification_by_mail', 'notification_by_mail.tpl'); } } @@ -435,7 +432,6 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su 'email_format' => $env_nbm['email_format'], 'content' => $env_nbm['mail_template']->parse('notification_by_mail', true), 'content_format' => $env_nbm['email_format'], - 'template' => $nbm_user['template'], 'theme' => $nbm_user['theme'] ) )) |