aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/session.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql4
-rw-r--r--phpBB/language/en/lang_admin.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 9b8cb117bd..3b7b528f77 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -147,7 +147,7 @@ class session
while ($row = $db->sql_fetchrow($result))
{
- if (preg_match('#' . str_replace('\*', '.*', preg_quote($row['bot_agent'], '#')) . '#i', $this->browser))
+ if (preg_match('#' . preg_quote($row['bot_agent'], '#') . '#i', $this->browser))
{
$bot = $row['user_id'];
}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index d025e719ca..4133ec3e2f 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -362,8 +362,8 @@ INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image
# MSSQL IDENTITY phpbb_bots ON #
# -- Bots
-INSERT INTO phpbb_bots (bot_id, bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (1, 1, 'Googlebot', 3, 'Googlebot/2.1 (+http://www.googlebot.com/bot.html)', '216.239.46.,64.68.8');
-INSERT INTO phpbb_bots (bot_id, bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (2, 1, 'Fastcrawler', 4, 'FAST-WebCrawler', '66.77.73.');
+INSERT INTO phpbb_bots (bot_id, bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (1, 1, 'Googlebot', 3, 'Googlebot/', '216.239.46.,64.68.8');
+INSERT INTO phpbb_bots (bot_id, bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (2, 1, 'Fastcrawler', 4, 'FAST-WebCrawler/', '66.77.73.');
INSERT INTO phpbb_bots (bot_id, bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (3, 1, 'Alexa ia_archiver', 5, 'ia_archiver', '66.28.250.,209.237.238.');
INSERT INTO phpbb_bots (bot_id, bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (4, 1, 'Inktomi', 6, 'Slurp', '216.35.116.');
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index 9171873c92..2b41e8a503 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -1805,7 +1805,7 @@ $lang += array(
'BOT_STYLE_EXPLAIN' => 'The style used for the board by the bot',
'BOT_ACTIVE' => 'Bot active',
'BOT_AGENT' => 'Agent match',
- 'BOT_AGENT_EXPLAIN' => 'A string matching the bots browser agent.',
+ 'BOT_AGENT_EXPLAIN' => 'A string matching the bots browser agent, partial matches are allowed.',
'BOT_IP' => 'Bot IP address',
'BOT_IP_EXPLAIN' => 'Partial matches are allowed, seperate addresses with an apostrophe. A single hostname may be entered instead of an IP.',