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 /system/libraries | |
| parent | 84c3bf369497e33b600deaea20297e89e265047a (diff) | |
| parent | 4f17de94737f5eb9e1230f7d854dea611ebd9901 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries')
| -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, '/').'/'; |