aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Minz/FrontController.php4
-rw-r--r--lib/lib_rss.php2
-rwxr-xr-xp/i/index.php2
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));
}
}