[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-5972-ga47c6e8

[Michal Čihař]

The branch, master has been updated
       via  a47c6e8bea4fa15bf1455e6ac8413ce014a12932 (commit)
      from  406f7e865398a698a6034271455984f80b4e7a24 (commit)


- Log -----------------------------------------------------------------
commit a47c6e8bea4fa15bf1455e6ac8413ce014a12932
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Jul 27 09:11:18 2010 +0200

    This might be called without initialized gettext.

-----------------------------------------------------------------------

Summary of changes:
 libraries/core.lib.php |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index c1a0b4b..d98320f 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -228,12 +228,18 @@ function PMA_fatalError($error_message, $message_args = null)
     }
     $error_message = strtr($error_message, array('<br />' => '[br]'));
 
+    if (function_exists('__')) {
+        $error_header = __('Error');
+    } else {
+        $error_header = 'Error';
+    }
+
     // Displays the error message
     // (do not use & for parameters sent by header)
     $query_params = array(
         'lang'  => $GLOBALS['available_languages'][$GLOBALS['lang']][1],
         'dir'   => $GLOBALS['text_dir'],
-        'type'  => __('Error'),
+        'type'  => $error_header,
         'error' => $error_message,
     );
     header('Location: ' . (defined('PMA_SETUP') ? '../' : '') . 'error.php?'


hooks/post-receive
-- 
phpMyAdmin