From 550f270a0027e67a0eb19d99fbe54d6045696a0b Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 22 Apr 2007 15:27:40 +0000 Subject: #10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624 prosilver adjustments for important announcements in ucp - #9995 MCP fixes for user notes/warnings - #9981 Preserving imageset values on save/edit find a member link for Mass PM's - #9925 syndicate window.onload events where necessary - #9878 Duplicate topics in forums with announcements - #9840 Email template for forced re-activation - #9808 Topic pagination adjustment - #9763 Changed compose message layout in UCP - #9706, #9702 Fixed inline attachment font size (hopefully) git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_users.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/acp/acp_users.php') diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index fa9709194b..5df9c418dc 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -282,6 +282,7 @@ class acp_users $key_len = 54 - (strlen($server_url)); $key_len = ($key_len > 6) ? $key_len : 6; $user_actkey = substr($user_actkey, 0, $key_len); + $email_template = ($user_row['user_type'] == USER_NORMAL) ? 'user_reactivate_account' : 'user_resend_inactive'; if ($user_row['user_type'] == USER_NORMAL) { @@ -295,7 +296,7 @@ class acp_users $messenger = new messenger(false); - $messenger->template('user_resend_inactive', $user_row['user_lang']); + $messenger->template($email_template, $user_row['user_lang']); $messenger->to($user_row['user_email'], $user_row['username']); @@ -1168,7 +1169,7 @@ class acp_users if ($submit) { $error = validate_data($data, array( - 'dateformat' => array('string', false, 3, 30), + 'dateformat' => array('string', false, 1, 30), 'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'), 'tz' => array('num', false, -14, 14), -- cgit v1.2.1