bug #4557 PHP fatal error, undefined function __()

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Oct 21, 2014 · e28912d · e28912d
1 parent a5516f3
commit e28912d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - bug       ReferenceError: Table_onover is not defined
 - bug #4552 Incorrect routines display for database due to case insensitive checks
 - bug #4259 reCaptcha sound session expired problem
+- bug #4557 PHP fatal error, undefined function __()
 
 4.2.10.1 (2014-10-21)
 - bug #4562 [security] XSS in debug SQL output

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
@@ -222,7 +222,13 @@ function PMA_fatalError(
 
         /* Load gettext for fatal errors */
         if (!function_exists('__')) {
-            include_once GETTEXT_INC;
+            // It is possible that PMA_fatalError() is called before including vendor_config.php
+            // which defines GETTEXT_INC. See bug #4557
+            if (defined(GETTEXT_INC)) {
+                include_once GETTEXT_INC;
+            } else {
+                include_once './libraries/php-gettext/gettext.inc';
+            }
         }
 
         // these variables are used in the included file libraries/error.inc.php