aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2022-03-24 21:32:37 +0100
committerGravatar GitHub <noreply@github.com> 2022-03-24 21:32:37 +0100
commitefb57f965a2942a7a8d204390859684edd010f6b (patch)
tree01c2713988f10ac19d43bd5785f76d9c030c89be /lib
parent954cc0510d77301f69860db585632f69c0417411 (diff)
Rename conflicting function (#4289)
#fix https://github.com/FreshRSS/FreshRSS/issues/4284
Diffstat (limited to 'lib')
-rw-r--r--lib/Minz/FrontController.php4
-rw-r--r--lib/lib_rss.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Minz/FrontController.php b/lib/Minz/FrontController.php
index 17bbc1818..dea818a91 100644
--- a/lib/Minz/FrontController.php
+++ b/lib/Minz/FrontController.php
@@ -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);
}
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index ba7b5b5d8..b6fde6437 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -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 = '';