diff options
| author | Greg Aker <greg@gregaker.net> | 2011-08-30 02:31:48 +0200 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-08-30 02:31:48 +0200 |
| commit | b50df5f018176c0cd0ad498e9c710a2b0b016a80 (patch) | |
| tree | 95733dbbcc348a92aad5d979db2e5da471859c25 /system/libraries/Migration.php | |
| parent | c964e72aabc3a646dbb82f6bf609e9532e75d011 (diff) | |
| parent | d7a28663344fbb760134b5623b8cb441f4875f80 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter 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, '/').'/'; |