diff options
| author | Pascal Kriete <pascal@pascalkriete.com> | 2011-08-12 18:54:13 +0200 |
|---|---|---|
| committer | Pascal Kriete <pascal@pascalkriete.com> | 2011-08-12 18:54:13 +0200 |
| commit | c4f024641ab69ed9cce62a2864e47e060b81048b (patch) | |
| tree | a4de86c0c6e95e6042ce66e84bdcd0c18c51d643 /system/libraries/User_agent.php | |
| parent | abccc2fa65eea5f64773952661a8ba79e559333b (diff) | |
| parent | b0eae5f81a4cb92911bb215ad814ae5caef4f61d (diff) | |
Merging - fingers crossed
Conflicts:
system/database/drivers/mysql/mysql_driver.php
system/database/drivers/mysqli/mysqli_driver.php
system/libraries/Email.php
user_guide/changelog.html
user_guide/database/configuration.html
user_guide/helpers/url_helper.html
user_guide/libraries/cart.html
user_guide/libraries/form_validation.html
Diffstat (limited to 'system/libraries/User_agent.php')
| -rw-r--r-- | system/libraries/User_agent.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index 016102a2a..0b77a7d42 100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -142,7 +142,7 @@ class CI_User_agent { { $this->_set_platform(); - foreach (array('_set_browser', '_set_robot', '_set_mobile') as $function) + foreach (array('_set_robot', '_set_browser', '_set_mobile') as $function) { if ($this->$function() === TRUE) { |