summaryrefslogtreecommitdiffstats
path: root/system/libraries/User_agent.php
diff options
context:
space:
mode:
authorbubbafoley <devnull@localhost>2011-03-17 20:55:41 +0100
committerbubbafoley <devnull@localhost>2011-03-17 20:55:41 +0100
commit0ea04149bbae0fdcde92b7362e7cbd76f0df3865 (patch)
tree9e7c26f6ccec07636c424003331fbcbc41ea95ff /system/libraries/User_agent.php
parentee8a712b10b517a90f03ac858312a82e0fb5d492 (diff)
load config files from environment specific locations in core classes, helpers and libraries
Diffstat (limited to 'system/libraries/User_agent.php')
-rw-r--r--system/libraries/User_agent.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 3774fc283..2690e174d 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -84,7 +84,16 @@ class CI_User_agent {
*/
private function _load_agent_file()
{
- if ( ! @include(APPPATH.'config/user_agents'.EXT))
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT))
+ {
+ $_ua_path = APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT;
+ }
+ else
+ {
+ $_ua_path = APPPATH.'config/user_agents'.EXT;
+ }
+
+ if ( ! @include($_ua_path))
{
return FALSE;
}