diff options
Diffstat (limited to 'phpBB/includes/acp/acp_extensions.php')
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 20 | 
1 files changed, 10 insertions, 10 deletions
| diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 379e779c2c..b41f4d4e81 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -58,13 +58,13 @@ class acp_extensions  		// If they've specified an extension, let's load the metadata manager and validate it.  		if ($ext_name)  		{ -			$md_manager = new phpbb_extension_metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $phpbb_root_path); +			$md_manager = new \phpbb\extension\metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $phpbb_root_path);  			try  			{  				$md_manager->get_metadata('all');  			} -			catch(phpbb_extension_exception $e) +			catch(\phpbb\extension\exception $e)  			{  				trigger_error($e);  			} @@ -120,7 +120,7 @@ class acp_extensions  						}  					}  				} -				catch (phpbb_db_migration_exception $e) +				catch (\phpbb\db\migration\exception $e)  				{  					$template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($user));  				} @@ -188,7 +188,7 @@ class acp_extensions  						}  					}  				} -				catch (phpbb_db_migration_exception $e) +				catch (\phpbb\db\migration\exception $e)  				{  					$template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($user));  				} @@ -217,7 +217,7 @@ class acp_extensions  	 * @param  $phpbb_extension_manager     An instance of the extension manager  	 * @return null  	 */ -	public function list_enabled_exts(phpbb_extension_manager $phpbb_extension_manager) +	public function list_enabled_exts(\phpbb\extension\manager $phpbb_extension_manager)  	{  		foreach ($phpbb_extension_manager->all_enabled() as $name => $location)  		{ @@ -236,7 +236,7 @@ class acp_extensions  					'PURGE'			=> $this->u_action . '&action=purge_pre&ext_name=' . urlencode($name),  				));  			} -			catch(phpbb_extension_exception $e) +			catch(\phpbb\extension\exception $e)  			{  				$this->template->assign_block_vars('disabled', array(  					'META_DISPLAY_NAME'		=> $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), @@ -251,7 +251,7 @@ class acp_extensions  	 * @param  $phpbb_extension_manager     An instance of the extension manager  	 * @return null  	 */ -	public function list_disabled_exts(phpbb_extension_manager $phpbb_extension_manager) +	public function list_disabled_exts(\phpbb\extension\manager $phpbb_extension_manager)  	{  		foreach ($phpbb_extension_manager->all_disabled() as $name => $location)  		{ @@ -270,7 +270,7 @@ class acp_extensions  					'PURGE'			=> $this->u_action . '&action=purge_pre&ext_name=' . urlencode($name),  				));  			} -			catch(phpbb_extension_exception $e) +			catch(\phpbb\extension\exception $e)  			{  				$this->template->assign_block_vars('disabled', array(  					'META_DISPLAY_NAME'		=> $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), @@ -285,7 +285,7 @@ class acp_extensions  	 * @param  $phpbb_extension_manager     An instance of the extension manager  	 * @return null  	 */ -	public function list_available_exts(phpbb_extension_manager $phpbb_extension_manager) +	public function list_available_exts(\phpbb\extension\manager $phpbb_extension_manager)  	{  		$uninstalled = array_diff_key($phpbb_extension_manager->all_available(), $phpbb_extension_manager->all_configured()); @@ -305,7 +305,7 @@ class acp_extensions  					'ENABLE'		=> $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),  				));  			} -			catch(phpbb_extension_exception $e) +			catch(\phpbb\extension\exception $e)  			{  				$this->template->assign_block_vars('disabled', array(  					'META_DISPLAY_NAME'		=> $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), | 
