From ea8d8084d1bd85c18be96faae27b0b4e6cfe69de Mon Sep 17 00:00:00 2001 From: Moc Date: Thu, 30 Nov 2023 20:47:01 +0100 Subject: [PATCH] Fixes #3438 - Remove duplicate LAN_ERROR_* --- e107_handlers/error_page_class.php | 8 ++++---- e107_languages/English/lan_error.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/e107_handlers/error_page_class.php b/e107_handlers/error_page_class.php index cbb43dadb..bfc291bdd 100644 --- a/e107_handlers/error_page_class.php +++ b/e107_handlers/error_page_class.php @@ -127,7 +127,7 @@ class error_page $this->template = 403; $this->title = LAN_ERROR_4; $this->caption = LAN_ERROR_45; - $this->content = LAN_ERROR_5 . '
' . LAN_ERROR_6 . '

' . LAN_ERROR_2; + $this->content = LAN_ERROR_5 . '
' . LAN_ERROR_3 . '

' . LAN_ERROR_2; } /** @@ -140,7 +140,7 @@ class error_page $this->template = 404; $this->title = LAN_ERROR_7; $this->caption = LAN_ERROR_45; - $this->content = LAN_ERROR_21 . '
' . LAN_ERROR_9; + $this->content = LAN_ERROR_21 . '
' . LAN_ERROR_3; } /** @@ -153,7 +153,7 @@ class error_page $this->template = 500; $this->title = LAN_ERROR_10; $this->caption = LAN_ERROR_14; - $this->content = LAN_ERROR_11 . '
' . LAN_ERROR_12; + $this->content = LAN_ERROR_11 . '
' . LAN_ERROR_3; } /** @@ -168,7 +168,7 @@ class error_page $this->template = 'DEFAULT'; $this->title = LAN_ERROR_13 . ' (' . $errorQuery . ')'; $this->caption = LAN_ERROR_14; - $this->content = LAN_ERROR_15; + $this->content = LAN_ERROR_3; } /** diff --git a/e107_languages/English/lan_error.php b/e107_languages/English/lan_error.php index 68aef0a04..f975e84a9 100644 --- a/e107_languages/English/lan_error.php +++ b/e107_languages/English/lan_error.php @@ -21,16 +21,16 @@ define("LAN_ERROR_3", "Please inform the administrator of the referring page if define("LAN_ERROR_4", "Error 403 - Access forbidden"); define("LAN_ERROR_5", "You are not permitted to retrieve the document or page you requested."); -define("LAN_ERROR_6", "Please inform the administrator of the referring page if you think this error page has been shown by mistake."); +//define("LAN_ERROR_6", "Please inform the administrator of the referring page if you think this error page has been shown by mistake."); // use LAN_ERROR_3 define("LAN_ERROR_7", "Error 404 - Document Not Found"); -define("LAN_ERROR_9", "Please inform the administrator of the referring page if you think this error message has been shown by mistake."); +//define("LAN_ERROR_9", "Please inform the administrator of the referring page if you think this error message has been shown by mistake."); // use LAN_ERROR_3 define("LAN_ERROR_10", "Error 500 - Internal server error"); define("LAN_ERROR_11", "The server encountered an internal error or misconfiguration and was unable to complete your request"); -define("LAN_ERROR_12", "Please inform the administrator of the referring page if you think this error page has been shown by mistake."); +//define("LAN_ERROR_12", "Please inform the administrator of the referring page if you think this error page has been shown by mistake."); // use LAN_ERROR_3 define("LAN_ERROR_13", "Error - Unknown"); define("LAN_ERROR_14", "The server encountered an error"); -define("LAN_ERROR_15", "Please inform the administrator of the referring page if you think this error page has been shown by mistake."); +//define("LAN_ERROR_15", "Please inform the administrator of the referring page if you think this error page has been shown by mistake."); // use LAN_ERROR_3 define("LAN_ERROR_16", "Your unsuccessful attempt to access"); define("LAN_ERROR_17", "has been recorded."); define("LAN_ERROR_18", "Apparently, you were referred here by");