makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14742] Make $last_run_migration protected

Browse source 
PHPBB3-14742
This commit is contained in:
Oliver Schramm 2016-08-11 15:37:53 +02:00
parent 6078bae7f8
commit b00a39b9ad
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/install/database_update.php
View file

@ -211,13 +211,6 @@ while (!$migrator->finished())
phpbb_end_update($cache, $config); phpbb_end_update($cache, $config);
} }
$state = array_merge(array(
'migration_schema_done' => false,
'migration_data_done' => false,
),
$migrator->last_run_migration['state']
);
// Are we approaching the time limit? If so we want to pause the update and continue after refreshing // 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) if ((time() - $update_start_time) >= $safe_time_limit)
{ {

15
phpBB/phpbb/db/migrator.php
View file

@ -80,7 +80,7 @@ class migrator
* *
* @var array * @var array
*/ */
public $last_run_migration = false; protected $last_run_migration = false;
/** /**
* The output handler. A null handler is configured by default. * The output handler. A null handler is configured by default.
@ -160,6 +160,19 @@ class migrator
$this->db->sql_return_on_error(false); $this->db->sql_return_on_error(false);
} }
/**
* Get an array with information about the last migration run.
*
* The array contains 'name', 'class' and 'state'. 'effectively_installed' is set
* and set to true if the last migration was effectively_installed.
*
* @return array
*/
public function get_last_run_migration()
{
return $this->last_run_migration;
}
/** /**
* Sets the list of available migration class names to the given array. * Sets the list of available migration class names to the given array.
* *