Made a few uniform changes to Migrations.
diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index 4bf1d0d..3943ec1 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -33,7 +33,7 @@
protected $_migration_path = NULL;
protected $_migration_version = 0;
- public $error = '';
+ protected $_error_string = '';
public function __construct($config = array())
{
@@ -124,7 +124,7 @@
// Only one migration per step is permitted
if (count($f) > 1)
{
- $this->error = sprintf($this->lang->line('migration_multiple_version'), $i);
+ $this->_error_string = sprintf($this->lang->line('migration_multiple_version'), $i);
return FALSE;
}
@@ -140,7 +140,7 @@
// If trying to migrate down but we're missing a step,
// something must definitely be wrong.
- $this->error = sprintf($this->lang->line('migration_not_found'), $i);
+ $this->_error_string = sprintf($this->lang->line('migration_not_found'), $i);
return FALSE;
}
@@ -155,7 +155,7 @@
// Cannot repeat a migration at different steps
if (in_array($match[1], $migrations))
{
- $this->error = sprintf($this->lang->line('migration_multiple_version'), $match[1]);
+ $this->_error_string = sprintf($this->lang->line('migration_multiple_version'), $match[1]);
return FALSE;
}
@@ -164,13 +164,13 @@
if ( ! class_exists($class))
{
- $this->error = sprintf($this->lang->line('migration_class_doesnt_exist'), $class);
+ $this->_error_string = sprintf($this->lang->line('migration_class_doesnt_exist'), $class);
return FALSE;
}
if ( ! is_callable(array($class, $method)))
{
- $this->error = sprintf($this->lang->line('migration_missing_'.$method.'_method'), $class);
+ $this->_error_string = sprintf($this->lang->line('migration_missing_'.$method.'_method'), $class);
return FALSE;
}
@@ -178,8 +178,7 @@
}
else
{
- exit('313');
- $this->error = sprintf($this->lang->line('migration_invalid_filename'), $file);
+ $this->_error_string = sprintf($this->lang->line('migration_invalid_filename'), $file);
return FALSE;
}
}
@@ -224,7 +223,7 @@
{
if ( ! $migrations = $this->find_migrations())
{
- $this->error = $this->line->lang('migration_none_found');
+ $this->_error_string = $this->line->lang('migration_none_found');
return false;
}
@@ -258,7 +257,7 @@
*/
public function error_string()
{
- return $this->error;
+ return $this->_error_string;
}
// --------------------------------------------------------------------