summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-29 16:50:09 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-29 16:50:09 +0200
commit70e61b5dc0b240c4a3341ca65ad9f2f5254df1b5 (patch)
treea0970957a17eeaa0e31e501d5ce537023b846110 /system/libraries
parent4c907236af3b6dc11a7b4989ece1c84a26483c46 (diff)
parent4f17de94737f5eb9e1230f7d854dea611ebd9901 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Migration.php2
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, '/').'/';