aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-06-15 11:19:19 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-06-15 11:19:19 +0000
commit8c79920a55e2b803cc050ad662b7da73a08f6998 (patch)
tree0b118a0361674cc724795be6ba340e6f9a664de0
parentf8f4b1373fb40bb069fe169426f921b649d1f46b (diff)
downloadforums-8c79920a55e2b803cc050ad662b7da73a08f6998.tar
forums-8c79920a55e2b803cc050ad662b7da73a08f6998.tar.gz
forums-8c79920a55e2b803cc050ad662b7da73a08f6998.tar.bz2
forums-8c79920a55e2b803cc050ad662b7da73a08f6998.tar.xz
forums-8c79920a55e2b803cc050ad662b7da73a08f6998.zip
Fix bug #45585 - Show error if hostname lookup doesn't return a valid IP address when banning.
Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9594 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_user.php3
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 0cc96dfa8e..3878d68d19 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -105,6 +105,7 @@
<li>[Fix] Only change topic/post icon if icons are enabled and user is allowed to. (Bug #46355 - Patch by bantu)</li>
<li>[Fix] Fix saving custom profile fields in ACP if Oracle used (Bug #46015)</li>
<li>[Fix] Make view_log() more resilient to corrupt serialized data. (Bug #46545)</li>
+ <li>[Fix] Show error if hostname lookup doesn't return a valid IP address when banning. (Bug #45585 - Patch by bantu)</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 48fb532d00..ab0122866c 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -910,7 +910,8 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
}
}
}
- else
+
+ if (empty($banlist_ary))
{
trigger_error('NO_IPS_DEFINED');
}