diff options
Diffstat (limited to 'phpBB/includes/extension/manager.php')
| -rw-r--r-- | phpBB/includes/extension/manager.php | 11 | 
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index 21a9ec1370..0d760681b9 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -49,13 +49,12 @@ class phpbb_extension_manager  	* @param phpbb_cache_driver_interface $cache A cache instance or null  	* @param string $cache_name The name of the cache variable, defaults to _ext  	*/ -	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_db_migrator $migrator, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext') +	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')  	{  		$this->container = $container;  		$this->phpbb_root_path = $phpbb_root_path;  		$this->db = $db;  		$this->config = $config; -		$this->migrator = $migrator;  		$this->cache = $cache;  		$this->php_ext = $php_ext;  		$this->extension_table = $extension_table; @@ -70,6 +69,14 @@ class phpbb_extension_manager  	}  	/** +	* Set migrator (get around circular reference) +	*/ +	public function set_migrator(phpbb_db_migrator $migrator) +	{ +		$this->migrator = $migrator; +	} + +	/**  	* Loads all extension information from the database  	*  	* @return null  | 
