diff --git a/ChangeLog b/ChangeLog index 5bc0d72639..f8b6de269d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 3.5.2.0 (not yet released) - bug #3521416 [interface] JS error when editing index +- bug #3521313 [core] Call to undefined function __() 3.5.1.0 (not yet released) - bug #3510784 [edit] Limit clause ignored when sort order is remembered diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 702f78f39f..e17886121b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -724,7 +724,10 @@ class PMA_Config if (! is_readable($this->getSource())) { $this->source_mtime = 0; die( - sprintf(__('Existing configuration file (%s) is not readable.'), + sprintf( + function_exists('__') + ? __('Existing configuration file (%s) is not readable.') + : 'Existing configuration file (%s) is not readable.', $this->getSource() ) );