mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'EXreaction/ticket/11393' into develop

Browse Source 
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11393:
  [ticket/11393] Give more information on database updater
This commit is contained in:
David King 2013-03-04 14:51:00 -05:00
commit e652c078e6
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/includes/db/migrator.php
View File

@ -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;
}
/**

23
phpBB/install/database_update.php
View File

@ -228,7 +228,28 @@ while (!$migrator->finished())
phpbb_end_update($cache);
}
echo $migrator->last_run_migration['name'] . '<br />';
$state = array_merge(array(
'migration_schema_done' => false,
'migration_data_done' => false,
),
$migrator->last_run_migration['state']
);
if (isset($migrator->last_run_migration['effectively_installed']) && $migrator->last_run_migration['effectively_installed'])
{
echo $user->lang('MIGRATION_EFFECTIVELY_INSTALLED', $migrator->last_run_migration['name']) . '<br />';
}
else
{
if ($state['migration_data_done'])
{
echo $user->lang('MIGRATION_DATA_DONE', $migrator->last_run_migration['name']) . '<br />';
}
else if ($state['migration_schema_done'])
{
echo $user->lang('MIGRATION_SCHEMA_DONE', $migrator->last_run_migration['name']) . '<br />';
}
}
// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
if ((time() - $update_start_time) >= $safe_time_limit)

3
phpBB/language/en/migrator.php
View File

@ -40,8 +40,11 @@ $lang = array_merge($lang, array(
'GROUP_NOT_EXIST' => 'The group "%s" unexpectedly does not exist.',
'MIGRATION_DATA_DONE' => 'Installed Data: %s',
'MIGRATION_EFFECTIVELY_INSTALLED' => 'Migration already effectively installed (skipped): %s',
'MIGRATION_EXCEPTION_ERROR' => 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.',
'MIGRATION_NOT_FULFILLABLE' => 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
'MIGRATION_SCHEMA_DONE' => 'Installed Schema: %s',
'MODULE_ALREADY_EXIST' => 'The module "%s" unexpectedly already exists.',
'MODULE_ERROR' => 'An error occured while creating a module: %s',