adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-19 16:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 1502: based on Dotclear model, P@t has reorganized the way Piwigo

Browse Source 
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
This commit is contained in:
plegall
2010-03-13 00:00:52 +00:00
parent c396f08708
commit 14778ce673
615 changed files with 652 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/include/functions_notification_by_mail.inc.php
+1 -5
View File
@@ -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']
)
))