diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-08-28 13:20:52 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-08-28 13:20:52 +0200 |
| commit | bbf2853c351425ea75f43599c3b229a8c323448c (patch) | |
| tree | 4d0e3f91192b7ffbe18bb08ecc4004981ff8a23c | |
| parent | 84c3bf369497e33b600deaea20297e89e265047a (diff) | |
| parent | 4f17de94737f5eb9e1230f7d854dea611ebd9901 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
| -rw-r--r-- | application/config/user_agents.php | 1 | ||||
| -rw-r--r-- | system/libraries/Migration.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/application/config/user_agents.php b/application/config/user_agents.php index e2d3c3af0..4746f2fcd 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -126,6 +126,7 @@ $mobiles = array( 'sendo' => "Sendo", // Operating Systems + 'android' => "Android", 'symbian' => "Symbian", 'SymbianOS' => "SymbianOS", 'elaine' => "Palm", diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php index 3943ec130..3734e18f5 100644 --- a/system/libraries/Migration.php +++ b/system/libraries/Migration.php @@ -57,7 +57,7 @@ class CI_Migration { } // If not set, set it - $this->_migration_path == '' OR $this->_migration_path = APPPATH . 'migrations/'; + $this->_migration_path == '' AND $this->_migration_path = APPPATH . 'migrations/'; // Add trailing slash if not set $this->_migration_path = rtrim($this->_migration_path, '/').'/'; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 33e0a62c1..978b710be 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -65,6 +65,7 @@ Change Log <ul> <li>General Changes <ul> + <li class="reactor">Added Android to the list of user agents.</li> <li class="reactor">Callback validation rules can now accept parameters like any other validation rule.</li> <li class="reactor">Ability to log certain error types, not all under a threshold.</li> <li class="reactor">Added html_escape() to <a href="general/common_functions.html">Common functions</a> to escape HTML output for preventing XSS.</li> |