diff options
Diffstat (limited to 'phpBB/phpbb/extension/base.php')
| -rw-r--r-- | phpBB/phpbb/extension/base.php | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php index 5bb530bad4..c7778cfed1 100644 --- a/phpBB/phpbb/extension/base.php +++ b/phpBB/phpbb/extension/base.php @@ -24,7 +24,7 @@ class base implements \phpbb\extension\extension_interface  	protected $container;  	/** @var \phpbb\finder */ -	protected $finder; +	protected $extension_finder;  	/** @var \phpbb\db\migrator */  	protected $migrator; @@ -73,9 +73,7 @@ class base implements \phpbb\extension\extension_interface  	*/  	public function enable_step($old_state)  	{ -		$migrations = $this->get_migration_file_list(); - -		$this->migrator->set_migrations($migrations); +		$this->get_migration_file_list();  		$this->migrator->update(); @@ -103,8 +101,6 @@ class base implements \phpbb\extension\extension_interface  	{  		$migrations = $this->get_migration_file_list(); -		$this->migrator->set_migrations($migrations); -  		foreach ($migrations as $migration)  		{  			while ($this->migrator->migration_state($migration) !== false) @@ -137,6 +133,10 @@ class base implements \phpbb\extension\extension_interface  		$migrations = $this->extension_finder->get_classes_from_files($migrations); +		$this->migrator->set_migrations($migrations); + +		$migrations = $this->migrator->get_migrations(); +  		return $migrations;  	}  } | 
