mirror of
https://github.com/FreshRSS/FreshRSS.git
synced 2026-10-23 11:38:34 -04:00
Rename conflicting function (#4289)
#fix https://github.com/FreshRSS/FreshRSS/issues/4284
This commit is contained in:
1 parent
954cc0510d
commit
efb57f965a
3 files changed
+4
-4
No files matched your search
@@ -100,9 +100,9 @@ class Minz_FrontController {
|
||||
* Permet d'arrêter le programme en urgence
|
||||
*/
|
||||
private function killApp ($txt = '') {
|
||||
if (function_exists('errorMessage')) {
|
||||
if (function_exists('errorMessageInfo')) {
|
||||
//If the application has defined a custom error message function
|
||||
exit(errorMessage('Application problem', $txt));
|
||||
exit(errorMessageInfo('Application problem', $txt));
|
||||
}
|
||||
exit('### Application problem ###<br />' . "\n" . $txt);
|
||||
}
|
||||
|
||||
+1
-1
@@ -726,7 +726,7 @@ function getNonStandardShortcuts($shortcuts) {
|
||||
return $nonStandard;
|
||||
}
|
||||
|
||||
function errorMessage($errorTitle, $error = '') {
|
||||
function errorMessageInfo($errorTitle, $error = '') {
|
||||
$errorTitle = htmlspecialchars($errorTitle, ENT_NOQUOTES, 'UTF-8');
|
||||
|
||||
$message = '';
|
||||
|
||||
+1
-1
@@ -65,6 +65,6 @@ if (!file_exists($applied_migrations_path)) {
|
||||
if ($error) {
|
||||
syslog(LOG_INFO, 'FreshRSS Fatal error! ' . $error);
|
||||
Minz_Log::error($error);
|
||||
die(errorMessage('Fatal error', $error));
|
||||
die(errorMessageInfo('Fatal error', $error));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user