aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/install_install.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-07-08 20:10:17 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-07-08 20:10:17 +0200
commita2918fd98e61db0e7e9885fb546abc024c84d0fc (patch)
tree9fa6b52d6bb55ec5256c67e821550e111ee50dbe /phpBB/install/install_install.php
parent31b221ae913c49fa2e2a776bd9fd54659728fcd0 (diff)
parent6da582e8be50fa7211706625402215f6f87ed48b (diff)
downloadforums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar
forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.gz
forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.bz2
forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.xz
forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9704] Fix minor typo in coding guidelines. [ticket/9690] Add forthcoming Bing Bot to list of recognized bots [ticket/9451] Add optional $can_upload parameter to avatar_process_user(). [ticket/9593] A readme file for unit tests and running unit tests. [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation. [ticket/9589] Added sample nginx configuration file for phpbb.
Diffstat (limited to 'phpBB/install/install_install.php')
-rw-r--r--phpBB/install/install_install.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index f4989b5bd7..4c22db07b2 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -2108,6 +2108,7 @@ class install_install extends module
'Alta Vista [Bot]' => array('Scooter/', ''),
'Ask Jeeves [Bot]' => array('Ask Jeeves', ''),
'Baidu [Spider]' => array('Baiduspider+(', ''),
+ 'Bing [Bot]' => array('bingbot/', ''),
'Exabot [Bot]' => array('Exabot/', ''),
'FAST Enterprise [Crawler]' => array('FAST Enterprise Crawler', ''),
'FAST WebCrawler [Crawler]' => array('FAST-WebCrawler/', ''),