Fix problem when admin send email information about category.
git-svn-id: http://piwigo.org/svn/trunk@1917 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
f1914f122e
commit
ea27482987
5 changed files with 8 additions and 4 deletions
|
|
@ -369,7 +369,8 @@ WHERE
|
||||||
$list = array();
|
$list = array();
|
||||||
while ($row = mysql_fetch_array($result))
|
while ($row = mysql_fetch_array($result))
|
||||||
{
|
{
|
||||||
list($row['template'], $row['theme']) = explode('/', $row['template']);
|
$row['template_theme'] = $row['template'];
|
||||||
|
list($row['template'], $row['theme']) = explode('/', $row['template_theme']);
|
||||||
$list[] = $row;
|
$list[] = $row;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -387,7 +388,8 @@ FROM
|
||||||
WHERE
|
WHERE
|
||||||
'.$conf['user_fields']['email'].' IS NOT NULL
|
'.$conf['user_fields']['email'].' IS NOT NULL
|
||||||
AND group_id = '.$group_id.'
|
AND group_id = '.$group_id.'
|
||||||
AND language = \''.$elem['language'].'\'
|
AND language = \''.$elem['language'].'\'
|
||||||
|
AND template = \''.$elem['template_theme'].'\'
|
||||||
;';
|
;';
|
||||||
|
|
||||||
$result = pwg_query($query);
|
$result = pwg_query($query);
|
||||||
|
|
|
||||||
|
|
@ -583,6 +583,7 @@ $lang['An information email was sent to group "%s"'] = 'An information email was
|
||||||
$lang['Send an information email to group members'] = 'Send an information email to group members';
|
$lang['Send an information email to group members'] = 'Send an information email to group members';
|
||||||
$lang['Group'] = 'Group';
|
$lang['Group'] = 'Group';
|
||||||
$lang['[%s] Come to visit the category %s'] = '[%s] Come to visit the category %s';
|
$lang['[%s] Come to visit the category %s'] = '[%s] Come to visit the category %s';
|
||||||
|
$lang['Hello,'] = 'Hello,';
|
||||||
$lang['See you soon.'] = 'See you soon.';
|
$lang['See you soon.'] = 'See you soon.';
|
||||||
$lang['Come to discover the category:'] = 'Come to discover the category:';
|
$lang['Come to discover the category:'] = 'Come to discover the category:';
|
||||||
$lang['mail_content'] = 'Mail content';
|
$lang['mail_content'] = 'Mail content';
|
||||||
|
|
|
||||||
|
|
@ -582,6 +582,7 @@ $lang['An information email was sent to group "%s"'] = 'Un mail d\'informations
|
||||||
$lang['Send an information email to group members'] = 'Envoyer un mail d\'informations aux membres d\'un groupe';
|
$lang['Send an information email to group members'] = 'Envoyer un mail d\'informations aux membres d\'un groupe';
|
||||||
$lang['Group'] = 'Groupe';
|
$lang['Group'] = 'Groupe';
|
||||||
$lang['[%s] Come to visit the category %s'] = '[%s] Venez visiter la catégorie %s';
|
$lang['[%s] Come to visit the category %s'] = '[%s] Venez visiter la catégorie %s';
|
||||||
|
$lang['Hello,'] = 'Bonjour,';
|
||||||
$lang['See you soon.'] = 'A bientôt.';
|
$lang['See you soon.'] = 'A bientôt.';
|
||||||
$lang['Come to discover the category:'] = 'Venez découvrir la catégorie:';
|
$lang['Come to discover the category:'] = 'Venez découvrir la catégorie:';
|
||||||
$lang['mail_content'] = 'Contenu du mail';
|
$lang['mail_content'] = 'Contenu du mail';
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<div id="cat_group_info">
|
<div id="cat_group_info">
|
||||||
<h2>{lang:Informations}</h2>
|
<h2>{lang:Informations}</h2>
|
||||||
<p>{IMG_URL}</p>
|
<p>{IMG_URL}</p>
|
||||||
<p>{lang:hello}</p>
|
<p>{lang:Hello,}</p>
|
||||||
<p>{lang:Come to discover the category:} <a href="{LINK}">{CAT_NAME}</a></p>
|
<p>{lang:Come to discover the category:} <a href="{LINK}">{CAT_NAME}</a></p>
|
||||||
<p>{CPL_CONTENT}</p>
|
<p>{CPL_CONTENT}</p>
|
||||||
<p>{lang:See you soon.}</p>
|
<p>{lang:See you soon.}</p>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{lang:hello}
|
{lang:Hello,}
|
||||||
|
|
||||||
{lang:Come to discover the category:} {CAT_NAME}
|
{lang:Come to discover the category:} {CAT_NAME}
|
||||||
{LINK}
|
{LINK}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue