diff options
| author | Michael Dennis <michaeljdennis@gmail.com> | 2011-08-29 19:06:59 +0200 |
|---|---|---|
| committer | Michael Dennis <michaeljdennis@gmail.com> | 2011-08-29 19:06:59 +0200 |
| commit | 013f78dc6a878d7775aa2bbcef573934a6d88a72 (patch) | |
| tree | 97ba05fd8e5efc066cb8f428744991fc628d207b /system/libraries/Migration.php | |
| parent | cb07a322bee5c5b0a551ab959c7475a1a702ad03 (diff) | |
| parent | 70e61b5dc0b240c4a3341ca65ad9f2f5254df1b5 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/libraries/Migration.php')
| -rw-r--r-- | system/libraries/Migration.php | 2 |
1 files changed, 1 insertions, 1 deletions
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, '/').'/'; |