diff options
author | Florian Pritz <bluewind@server-speed.net> | 2011-04-10 10:39:31 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@server-speed.net> | 2011-04-10 10:39:31 +0200 |
commit | 1bdc9c8903eb2db33fdb8174d61e15100dfbbca8 (patch) | |
tree | b0c645ad99e04f34817fc4e6385792111db42274 /system/libraries/User_agent.php | |
parent | 413d0cdac49257089a0790f6ac92973a36a6b69f (diff) |
update to CI 2.0.2
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
Diffstat (limited to 'system/libraries/User_agent.php')
-rwxr-xr-x | system/libraries/User_agent.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index c62174836..04cda7312 100755 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -84,7 +84,15 @@ class CI_User_agent { */ private function _load_agent_file() { - if ( ! @include(APPPATH.'config/user_agents'.EXT)) + if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT)) + { + include(APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT); + } + elseif (is_file(APPPATH.'config/user_agents'.EXT)) + { + include(APPPATH.'config/user_agents'.EXT); + } + else { return FALSE; } @@ -375,7 +383,11 @@ class CI_User_agent { */ public function is_referral() { - return ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == ''); + if ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == '') + { + return FALSE; + } + return TRUE; } // -------------------------------------------------------------------- |