From 6d2c815c7565123cedadbfdca25ebecc76ff168c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Sun, 10 Sep 2017 14:46:37 +0200 Subject: [PATCH] [ticket/15311] Detail errors a little more PHPBB3-15311 --- phpBB/includes/acp/acp_database.php | 5 ++--- phpBB/language/en/acp/database.php | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index ea1656d297..a256f5260e 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -335,7 +335,7 @@ class acp_database } catch (\phpbb\storage\exception\exception $e) { - + // If open fails, just finish } flush(); @@ -360,8 +360,7 @@ class acp_database } catch (\phpbb\storage\exception\exception $e) { - // Error while copying file from storage to temp - exit; + trigger_error($user->lang['RESTORE_DOWNLOAD_FAIL'] . adm_back_link($this->u_action)); } switch ($matches[1]) diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php index 6d0fc2f1e2..7170cefe8e 100644 --- a/phpBB/language/en/acp/database.php +++ b/phpBB/language/en/acp/database.php @@ -59,6 +59,7 @@ $lang = array_merge($lang, array( 'FILE_WRITE_FAIL' => 'Unable to write file to storage folder.', 'FULL_BACKUP' => 'Full', + 'RESTORE_DOWNLOAD_FAIL' => 'Error while copying file from storage to local temporary folder.', 'RESTORE_FAILURE' => 'The backup file may be corrupt.', 'RESTORE_OPTIONS' => 'Restore options', 'RESTORE_SELECTED_BACKUP' => 'Are you sure you want to restore the selected backup?',