summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-28 10:10:20 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-28 10:10:20 +0200
commit4f17de94737f5eb9e1230f7d854dea611ebd9901 (patch)
tree4d0e3f91192b7ffbe18bb08ecc4004981ff8a23c
parentc3757b80ebe76ab3807933901cda0e9b7a405690 (diff)
parentdae42fa65fc65e43d704f1a6c139e985e93486f4 (diff)
Merge pull request #326 from bubbafoley/patch-1
Default migration path not set correctly
-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, '/').'/';