makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

#26885

Browse source 
git-svn-id: file:///svn/phpbb/trunk@8564 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-05-18 20:02:14 +00:00
parent 41d8c20836
commit 53dc95d429
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/includes/functions_user.php
View file

@ -1194,6 +1194,8 @@ function user_ipwhois($ip)
*/ */
function validate_data($data, $val_ary) function validate_data($data, $val_ary)
{ {
global $user;
$error = array(); $error = array();
foreach ($val_ary as $var => $val_seq) foreach ($val_ary as $var => $val_seq)
@ -1210,7 +1212,8 @@ function validate_data($data, $val_ary)
if ($result = call_user_func_array('validate_' . $function, $validate)) if ($result = call_user_func_array('validate_' . $function, $validate))
{ {
$error[] = $result . '_' . strtoupper($var); // Since errors are checked later for their language file existence, we need to make sure custom errors are not adjusted.
$error[] = (empty($user->lang[$result . '_' . strtoupper($var)])) ? $result : $result . '_' . strtoupper($var);
} }
} }
} }
@ -1535,9 +1538,9 @@ function validate_email($email, $allowed_email = false)
} }
} }
if ($user->check_ban(false, false, $email, true) == true) if (($ban_reason = $user->check_ban(false, false, $email, true)) !== false)
{ {
return 'EMAIL_BANNED'; return ($ban_reason === true) ? 'EMAIL_BANNED' : $ban_reason;
} }
if (!$config['allow_emailreuse']) if (!$config['allow_emailreuse'])

2
phpBB/styles/prosilver/template/mcp_queue.html
View file

@ -36,7 +36,7 @@
<!-- BEGIN postrow --> <!-- BEGIN postrow -->
<!-- IF postrow.S_DELETED_TOPIC --> <!-- IF postrow.S_DELETED_TOPIC -->
<li><p class="notopics">{L_DELETED_TOPIC}</li> <li><p class="notopics">{L_DELETED_TOPIC}</p></li>
<!-- ELSE --> <!-- ELSE -->
<li class="row<!-- IF postrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> <li class="row<!-- IF postrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">