From efb57f965a2942a7a8d204390859684edd010f6b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 24 Mar 2022 21:32:37 +0100
Subject: Rename conflicting function (#4289)

#fix https://github.com/FreshRSS/FreshRSS/issues/4284
---
 lib/Minz/FrontController.php | 4 ++--
 lib/lib_rss.php              | 2 +-
 p/i/index.php                | 2 +-
 3 files changed, 4 insertions(+), 4 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 = '';
diff --git a/p/i/index.php b/p/i/index.php
index 71b19a1ca..949d82aec 100755
--- a/p/i/index.php
+++ b/p/i/index.php
@@ -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));
 	}
 }
-- 
cgit v1.2.3