Merge most changes from 3.0.x branch since the 25th december.

(Captcha changes for refreshing captcha image not included)

git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/classes/session.php

@@ -1192,6 +1192,11 @@ abstract class phpbb_session
 
 				foreach (explode(',', $row['bot_ip']) as $bot_ip)
 				{
+					if (!trim($bot_ip))
+					{
+						continue;
+					}
+
 					if (strpos($this->system['ip'], $bot_ip) === 0)
 					{
 						$bot = (int) $row['user_id'];