The branch, master has been updated
via efa9eeb5583d95972af3fe195e903ac843103de8 (commit)
via 5b2befc1716bfca6b21305a0cb5df6d965eb4c9a (commit)
from 3cbc022058c384cdc0327405ef4ebac8df94fbe4 (commit)
- Log -----------------------------------------------------------------
commit efa9eeb5583d95972af3fe195e903ac843103de8
Merge: 3cbc022 5b2befc
Author: Marc Delisle <[email protected]>
Date: Sat Sep 24 06:03:54 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
main.php | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 99e2dc6..cd028c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog
- bug #3383572 [interface] Cannot execute saved query
- bug #3411535 [display] Full text button unchecks results display options
- bug #3411224 [display] Broken binary column when 'Show binary contents' is
not set
+- bug #3411633 [core] Call to undefined function PMA_isSuperuser()
3.4.5.0 (2011-09-14)
- bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/main.php b/main.php
index f85f1c0..051b5ef 100644
--- a/main.php
+++ b/main.php
@@ -139,10 +139,12 @@ echo '</ul>';
// User preferences
-echo '<ul>';
-echo PMA_printListItem(__('More settings'), 'li_user_preferences',
+if ($server > 0) {
+ echo '<ul>';
+ echo PMA_printListItem(__('More settings'), 'li_user_preferences',
'./prefs_manage.php?' . $common_url_query);
-echo '</ul>';
+ echo '</ul>';
+}
echo '</div>';
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-d2dcopy2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
