From 45afbb48fb9b18ccc8d4ca792cc64a23ec3bb6db Mon Sep 17 00:00:00 2001 From: mistic100 Date: Tue, 26 Nov 2013 20:54:07 +0000 Subject: remove is_adviser() and get_email_address_as_display_text() git-svn-id: http://piwigo.org/svn/trunk@25729 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/notification_by_mail.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'admin/notification_by_mail.php') diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php index 8c2f5e278..fefc23560 100644 --- a/admin/notification_by_mail.php +++ b/admin/notification_by_mail.php @@ -169,7 +169,7 @@ order by $page['infos'][] = l10n( 'User %s [%s] added.', stripslashes($nbm_user['username']), - get_email_address_as_display_text($nbm_user['mail_address']) + $nbm_user['mail_address'] ); } @@ -646,7 +646,7 @@ switch ($page['mode']) { if (get_boolean($nbm_user['enabled'])) { - $opt_true[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.get_email_address_as_display_text($nbm_user['mail_address']).']'; + $opt_true[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.$nbm_user['mail_address'].']'; 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']; @@ -654,7 +654,7 @@ switch ($page['mode']) } else { - $opt_false[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.get_email_address_as_display_text($nbm_user['mail_address']).']'; + $opt_false[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.$nbm_user['mail_address'].']'; if (isset($_POST['trueify']) and isset($_POST['cat_false']) and in_array($nbm_user['check_key'], $_POST['cat_false'])) { $opt_false_selected[] = $nbm_user['check_key']; @@ -700,7 +700,7 @@ switch ($page['mode']) !in_array($nbm_user['check_key'], $_POST['send_selection']) // not selected ) ? '' : 'checked="checked"', 'USERNAME'=> stripslashes($nbm_user['username']), - 'EMAIL' => get_email_address_as_display_text($nbm_user['mail_address']), + 'EMAIL' => $nbm_user['mail_address'], 'LAST_SEND'=> $nbm_user['last_send'] ); } -- cgit v1.2.3