summaryrefslogtreecommitdiffstats
path: root/system/libraries/Migration.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-17 14:02:21 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-17 14:02:21 +0200
commite8e09039b49ac5883e9e94162579841375e13c69 (patch)
treec206119bbc5bdcd573b56609b6450b14e6c20dcb /system/libraries/Migration.php
parent43c216b998ccf8c8208b237e9e0d9c468c8a82e5 (diff)
parentae31eb5e75d914fc3ab622a7ac5c23eb1e6d9f9a (diff)
Merge upstream
Diffstat (limited to 'system/libraries/Migration.php')
-rw-r--r--system/libraries/Migration.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index ce4683fc1..0a88e6926 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -45,28 +45,28 @@ class CI_Migration {
* @var bool
*/
protected $_migration_enabled = FALSE;
-
+
/**
* Path to migration classes
*
* @var string
*/
protected $_migration_path = NULL;
-
+
/**
* Current migration version
*
* @var mixed
*/
protected $_migration_version = 0;
-
+
/**
* Database table with migration info
*
* @var string
*/
protected $_migration_table = 'migrations';
-
+
/**
* Whether to automatically run migrations
*
@@ -85,6 +85,7 @@ class CI_Migration {
* Initialize Migration Class
*
* @param array
+ * @return void
*/
public function __construct($config = array())
{
@@ -96,7 +97,7 @@ class CI_Migration {
foreach ($config as $key => $val)
{
- $this->{'_' . $key} = $val;
+ $this->{'_'.$key} = $val;
}
log_message('debug', 'Migrations class initialized');
@@ -340,7 +341,6 @@ class CI_Migration {
}
sort($files);
-
return $files;
}
@@ -384,6 +384,7 @@ class CI_Migration {
{
return get_instance()->$var;
}
+
}
/* End of file Migration.php */