mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/10631] Simplify exceptions

Browse Source 
PHPBB-10631
This commit is contained in:
Nathan Guse
2012-07-23 20:28:04 -05:00
committed by Unknown Bliss
parent 89f4cf6a8c
commit 2a7e129291
4 changed files with 55 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
phpBB/includes/acp/acp_extensions.php
View File

@@ -49,9 +49,12 @@ class acp_extensions
{
$md_manager = new phpbb_extension_metadata_manager($ext_name, $db, $phpbb_extension_manager, $phpbb_root_path, ".$phpEx", $template, $config);
try{
try
{
$md_manager->get_metadata('all');
} catch( Exception $e ) {
}
catch(phpbb_extension_exception $e)
{
trigger_error($e);
}
}
@@ -172,7 +175,8 @@ class acp_extensions
{
$md_manager = $phpbb_extension_manager->get_extension_metadata_manager($name, $this->template);
try {
try
{
$this->template->assign_block_vars('enabled', array(
'EXT_NAME' => $md_manager->get_metadata('display-name'),
@@ -183,7 +187,9 @@ class acp_extensions
'DISABLE' => $this->u_action . '&action=disable_pre&ext_name=' . $name,
'PURGE' => $this->u_action . '&action=purge_pre&ext_name=' . $name,
));
} catch( Exception $e ) {
}
catch(phpbb_extension_exception $e)
{
$this->template->assign_block_vars('disabled', array(
'EXT_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e),
));
@@ -204,7 +210,8 @@ class acp_extensions
{
$md_manager = $phpbb_extension_manager->get_extension_metadata_manager($name, $this->template);
try {
try
{
$this->template->assign_block_vars('disabled', array(
'EXT_NAME' => $md_manager->get_metadata('display-name'),
@@ -215,7 +222,9 @@ class acp_extensions
'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . $name,
'PURGE' => $this->u_action . '&action=purge_pre&ext_name=' . $name,
));
} catch( Exception $e ) {
}
catch(phpbb_extension_exception $e)
{
$this->template->assign_block_vars('disabled', array(
'EXT_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e),
));
@@ -238,7 +247,8 @@ class acp_extensions
{
$md_manager = $phpbb_extension_manager->get_extension_metadata_manager($name, $this->template);
try {
try
{
$this->template->assign_block_vars('disabled', array(
'EXT_NAME' => $md_manager->get_metadata('display-name'),
@@ -248,7 +258,9 @@ class acp_extensions
$this->output_actions('disabled', array(
'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . $name,
));
} catch( Exception $e ) {
}
catch(phpbb_extension_exception $e)
{
$this->template->assign_block_vars('disabled', array(
'EXT_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e),
));