summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames L Parry <jim_parry@bcit.ca>2014-11-24 09:35:35 +0100
committerJames L Parry <jim_parry@bcit.ca>2014-11-24 09:35:35 +0100
commit68e1d99ad2dcf5dfad8618635fd7f88d106faa0b (patch)
tree2b1376c8a022a62a88ddeea151a6707202bceb68
parent82c022a9636519062a6e48b71c64b6187cbe6637 (diff)
parent8cdf3cf639eba454c9cdb5004379a012752b386f (diff)
Merge branch 'develop', remote branch 'upstream/develop' into develop
-rw-r--r--application/config/user_agents.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 51530e2f8..35e3d5a33 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -229,15 +229,20 @@ $mobiles = array(
$robots = array(
'googlebot' => 'Googlebot',
'msnbot' => 'MSNBot',
- 'baiduspider' => 'Baiduspider',
+ 'baiduspider' => 'Baiduspider',
'bingbot' => 'Bing',
'slurp' => 'Inktomi Slurp',
'yahoo' => 'Yahoo',
'askjeeves' => 'AskJeeves',
- 'fastcrawler' => 'FastCrawler',
+ 'fastcrawler' => 'FastCrawler',
'infoseek' => 'InfoSeek Robot 1.0',
'lycos' => 'Lycos',
- 'yandex' => 'YandexBot'
+ 'yandex' => 'YandexBot',
+ 'mediapartners-google' => 'MediaPartners Google',
+ 'CRAZYWEBCRAWLER' => 'Crazy Webcrawler',
+ 'adsbot-google' => 'AdsBot Google',
+ 'feedfetcher-google' => 'Feedfetcher Google',
+ 'curious george' => 'Curious George'
);
/* End of file user_agents.php */