diff options
| author | purandi <free6300@gmail.com> | 2011-09-04 14:51:23 +0200 |
|---|---|---|
| committer | purandi <free6300@gmail.com> | 2011-09-04 14:51:23 +0200 |
| commit | ab0dbd4b992778678e00ea3f2a3dd4bf5f1ff504 (patch) | |
| tree | 740d3cabe5e51f18578a72abf6e13e62fba9eb62 /system/libraries | |
| parent | dcf3d1bf17e1354ff0a644f390ed590f2e65298b (diff) | |
| parent | 2eb2557bf1c438d8fb7d612dbb76c6676eaec4d6 (diff) | |
Merge branch 'develop', remote-tracking branch 'origin/develop' 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, '/').'/'; |