Index: core/admin_templates/error_fatal.tpl
===================================================================
--- /dev/null
+++ core/admin_templates/error_fatal.tpl
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
' . $this->_logger->toString($errno) . '
';
- exit;
+ if ( PHP_SAPI == 'cli' || $this->_logger->applicationShutdown || $this->Application->isDebugMode(false) ) {
+ $css_properties = array(
+ 'background-color: #FEFFBF',
+ 'margin: ' . ($this->Application->isAdmin ? '8px' : 'auto'),
+ 'padding: 10px',
+ 'border: 2px solid red',
+ 'text-align: center',
+ );
+ echo '' . $message . '
';
+ exit;
+ }
+ else {
+ $this->Application->StoreVar('FatalErrorMessage', $message);
+ $redirect_params = array();
+
+ if ( $this->Application->isDebugMode() && $this->_logger->lastLogId ) {
+ $redirect_params['system-log_id'] = $this->_logger->lastLogId;
+ }
+
+ if ( $this->Application->isAdmin ) {
+ $this->Application->Redirect('error_fatal', $redirect_params);
+ }
+ else {
+ $this->Application->Redirect($this->Application->ConfigValue('FatalErrorTemplate'), $redirect_params);
+ }
+ }
}
/**
Index: core/units/admin/admin_config.php
===================================================================
--- core/units/admin/admin_config.php
+++ core/units/admin/admin_config.php
@@ -45,6 +45,7 @@
'sql_query' => Array ('format' => '!la_tab_QueryDB!'),
'no_permissions' => Array ('format' => '!la_title_NoPermissions!'),
+ 'error_fatal' => array('format' => '!la_title_ServerError!'),
'column_picker' => Array ('format' => '!la_title_ColumnPicker!'),
'csv_export' => Array ('format' => '!la_title_CSVExport!'),
@@ -98,4 +99,4 @@
'Content' => Array ('type' => 'string', 'default' => ''),
),
-);
\ No newline at end of file
+);
Index: core/units/categories/categories_event_handler.php
===================================================================
--- core/units/categories/categories_event_handler.php
+++ core/units/categories/categories_event_handler.php
@@ -1781,7 +1781,7 @@
}
}
else {
- $not_found = $this->Application->ConfigValue('ErrorTemplate');
+ $not_found = $this->Application->ConfigValue('NotFoundErrorTemplate');
$real_t = $not_found ? $not_found : 'error_notfound';
$themes_helper = $this->Application->recallObject('ThemesHelper');
Index: themes/advanced/_install/english.lang
===================================================================
--- themes/advanced/_install/english.lang
+++ themes/advanced/_install/english.lang
@@ -307,6 +307,7 @@
Q2xpY2sgaGVyZSBpZiB5b3VyIGJyb3dzZXIgZG9lcyBub3QgYXV0b21hdGljYWxseSByZWRpcmVjdCB5b3Uu
VGhhbmsgeW91IGZvciByZWdpc3RlcmluZyBvbiBvdXIgd2Vic2l0ZS4gWW91IGNhbiBhY3RpdmF0ZSB5b3VyIHJlZ2lzdHJhdGlvbiB1c2luZyBsaW5rIHNlbnQgdG8geW91IGJ5IGVtYWlsLg==
VGhhbmsgeW91IGZvciByZWdpc3RlcmluZyBvbiBvdXIgd2Vic2l0ZS4gWW91ciByZWdpc3RyYXRpb24gaXMgcGVuZGluZyBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbC4gWW91IHdpbGwgZ2V0IGEgc2VwYXJhdGUgZW1haWwgb25jZSBpdCdzIGFjdGl2YXRlZC4=
+ T3Bwcywgc29tZXRoaW5nIHdlbnQgd3JvbmcgLi4u
VGhhbmsgeW91IGZvciBzdWdnZXN0aW5nIHlvdXIgY2F0ZWdvcnku
U3VnZ2VzdGVkIGNhdGVnb3J5IGlzIHBlbmRpbmcgZm9yIEFkbWluaXN0cmF0aXZlIGFwcHJvdmFsIA==
VGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgcmVxdWVzdC4=
@@ -354,6 +355,7 @@
Q29tbWVudHM=
U2VhcmNoIEJveA==
U2VhcmNoIFJlc3VsdHM=
+ U2VydmVyIEVycm9y
U2l0ZSBtYXA=
U3Vic2NyaXB0aW9uIENvbmZpcm1hdGlvbg==
U3Vic2NyaXB0aW9uIENvbmZpcm1lZA==
@@ -390,4 +392,4 @@
WklQIENvZGU=
-
\ No newline at end of file
+
Index: themes/advanced/error_fatal.tpl
===================================================================
--- /dev/null
+++ themes/advanced/error_fatal.tpl
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+