adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug of svn:2249

Browse Source 
Fix quicky mail error with smarty

git-svn-id: http://piwigo.org/svn/trunk@2262 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2008-03-07 06:42:43 +00:00
parent 8faa265e74
commit 0c83b734fb
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/notification_by_mail.php
+7 -7
View File
@@ -690,16 +690,16 @@ switch ($page['mode'])
$data_users = get_user_notifications('subscribe');
$opt_true=array();
$opt_true_selected=array();
$opt_false=array();
$opt_false_selected=array();
$opt_true = array();
$opt_true_selected = array();
$opt_false = array();
$opt_false_selected = array();
foreach ($data_users as $nbm_user)
{
if ( get_boolean($nbm_user['enabled']) )
if (get_boolean($nbm_user['enabled']))
{
$opt_true[ $nbm_user['check_key'] ] = $nbm_user['username'].'['.get_email_address_as_display_text($nbm_user['mail_address']).']';
if ((isset($_POST['falsify']) and isset($_POST['cat_true']) and in_array($nbm_user['check_key'], $_POST['cat_true'])) )
if ((isset($_POST['falsify']) and isset($_POST['cat_true']) and in_array($nbm_user['check_key'], $_POST['cat_true'])))
{
$opt_true_selected[] = $nbm_user['check_key'];
}
@@ -717,7 +717,7 @@ switch ($page['mode'])
'category_option_true' => $opt_true,
'category_option_true_selected' => $opt_true_selected,
'category_option_false' => $opt_false,
'category_option_true' => $opt_false_selected,
'category_option_true_selected' => $opt_false_selected,
)
);
break;
include/functions_mail.inc.php
+4 -3
View File
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | file : $Id$
// | last update : $Date$
@@ -175,8 +175,9 @@ function get_mail_template($email_format, $args = array())
$args = get_array_template_theme($args);
$mail_template = new Template(PHPWG_ROOT_PATH.'template/'.$args['template'], $args['theme']);
$mail_template->set_rootdir(PHPWG_ROOT_PATH.'template/'.$args['template'].'/mail/'.$email_format);
$mail_template->_old->set_rootdir(PHPWG_ROOT_PATH.'template/'.$args['template'].'/mail/'.$email_format);
$mail_template->smarty->template_dir = PHPWG_ROOT_PATH.'template/'.$args['template'].'/mail/'.$email_format;
return $mail_template;
}