The branch, master has been updated
via 4b80c81536aa9dee63aff1d2e0197572760b5a72 (commit)
via ed88c4a7b68c8efd764a364d1a9579aa762ebdaa (commit)
from d64e4ea58daf52fbc81ddc12262647ec0056861c (commit)
- Log -----------------------------------------------------------------
commit 4b80c81536aa9dee63aff1d2e0197572760b5a72
Merge: d64e4ea58daf52fbc81ddc12262647ec0056861c
ed88c4a7b68c8efd764a364d1a9579aa762ebdaa
Author: Michal Čihař <[email protected]>
Date: Sun Jul 10 22:47:34 2011 +0200
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
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 e61c146..371aec2 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -253,7 +253,13 @@ function PMA_getPHPDocLink($target) {
*/
function PMA_warnMissingExtension($extension, $fatal = false, $extra = '')
{
- $message = sprintf(__('The %s extension is missing. Please check your PHP
configuration.'),
+ /* Gettext does not have to be loaded yet here */
+ if (function_exists('__')) {
+ $message = __('The %s extension is missing. Please check your PHP
configuration.');
+ } else {
+ $message = 'The %s extension is missing. Please check your PHP
configuration.';
+ }
+ $message = sprintf($message,
'[a@' . PMA_getPHPDocLink('book.' . $extension . '.php') .
'@Documentation][em]' . $extension . '[/em][/a]');
if ($extra != '') {
$message .= ' ' . $extra;
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
