The branch, QA_3_4 has been updated via 5b2befc1716bfca6b21305a0cb5df6d965eb4c9a (commit) from a211b8ba0ee947a0aacdf23b7ec72fb038a0c83c (commit)

- Log ----------------------------------------------------------------- -----------------------------------------------------------------------

Summary of changes: ChangeLog | 1 + main.php | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 6ba0b67..e46b9df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,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 836a250..0b0de1a 100644 --- a/main.php +++ b/main.php @@ -142,10 +142,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