mirror of
https://github.com/Piwigo/Piwigo.git
synced 2025-04-26 19:29:58 +03:00
Resolved Issue ID 0000507:
o format of email o max_execution_time equal to 0 o -f with only adress mail o use of standard function get_webmaster_mail_address 2 news $conf parameters. Merge branch-1_6 r1529:1530 into BSF git-svn-id: http://piwigo.org/svn/trunk@1531 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
9d38573074
commit
e097dba6a6
4 changed files with 38 additions and 17 deletions
12
password.php
12
password.php
|
@ -42,16 +42,8 @@ $page['infos'] = array();
|
|||
|
||||
if (isset($_POST['submit']))
|
||||
{
|
||||
// in case of error, creation of mailto link
|
||||
$query = '
|
||||
SELECT '.$conf['user_fields']['email'].'
|
||||
FROM '.USERS_TABLE.'
|
||||
WHERE '.$conf['user_fields']['id'].' = '.$conf['webmaster_id'].'
|
||||
;';
|
||||
list($mail_webmaster) = mysql_fetch_array(pwg_query($query));
|
||||
|
||||
$mailto =
|
||||
'<a href="mailto:'.$mail_webmaster.'">'
|
||||
'<a href="mailto:'.get_webmaster_mail_address().'">'
|
||||
.l10n('Contact webmaster')
|
||||
.'</a>'
|
||||
;
|
||||
|
@ -92,7 +84,7 @@ WHERE '
|
|||
."\n".l10n('Password').': '.$new_password
|
||||
;
|
||||
|
||||
if (pwg_mail($row['email'], $mail_webmaster, l10n('password updated'), $infos))
|
||||
if (pwg_mail($row['email'], '', l10n('password updated'), $infos))
|
||||
{
|
||||
$data =
|
||||
array(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue