aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2013-03-04 14:51:00 -0500
committerDavid King <imkingdavid@gmail.com>2013-03-04 14:51:00 -0500
commite652c078e694082a6cec76cc998bea346e66f02b (patch)
tree88539fff381b03669c8aa536a22798a2cebcded5 /phpBB/includes
parenteb5075c80f9ddbec220e613a92ba37aa03a8a4f9 (diff)
parent6cad032fbb2ceba892c861f8a2abab82574b12ae (diff)
downloadforums-e652c078e694082a6cec76cc998bea346e66f02b.tar
forums-e652c078e694082a6cec76cc998bea346e66f02b.tar.gz
forums-e652c078e694082a6cec76cc998bea346e66f02b.tar.bz2
forums-e652c078e694082a6cec76cc998bea346e66f02b.tar.xz
forums-e652c078e694082a6cec76cc998bea346e66f02b.zip
Merge remote-tracking branch 'EXreaction/ticket/11393' into develop
# By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11393: [ticket/11393] Give more information on database updater
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/db/migrator.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 7b5e8cb2de..95a28618e8 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -63,7 +63,9 @@ class phpbb_db_migrator
protected $migrations = array();
/**
- * 'name' and 'class' of the last migration run
+ * 'name,' 'class,' and 'state' of the last migration run
+ *
+ * 'effectively_installed' set and set to true if the migration was effectively_installed
*
* @var array
*/
@@ -304,6 +306,7 @@ class phpbb_db_migrator
$this->last_run_migration = array(
'name' => $name,
'class' => $migration,
+ 'state' => $state,
);
if (!isset($this->migration_state[$name]))
@@ -318,6 +321,8 @@ class phpbb_db_migrator
'migration_start_time' => 0,
'migration_end_time' => 0,
);
+
+ $this->last_run_migration['effectively_installed'] = true;
}
else
{
@@ -662,6 +667,8 @@ class phpbb_db_migrator
}
$this->migration_state[$name] = $state;
+
+ $this->last_run_migration['state'] = $state;
}
/**