Merge remote-tracking branch 'origin/master'

2014-01-28 03:36:45 +01:00 · 2014-01-28 03:36:45 +01:00 · 6ccdf990b0
commit 6ccdf990b0
parent 7abc4c8dfb 1e5517c470
2 changed files with 4 additions and 0 deletions
--- a/2
+++ b/2
@ -21,6 +21,8 @@ phpMyAdmin - ChangeLog

 4.1.7.0 (not yet released)
 - bug #4245 initial Browse query does not match sorting order
+- bug #4250 Notice on export page
+- bug #4253 "New" text in navigation frame acts like a database

 4.1.6.0 (2014-01-26)
 - bug #4232 User not found after creating the user
--- a/libraries/navigation/Nodes/Node_Database_Container.class.php
+++ b/libraries/navigation/Nodes/Node_Database_Container.class.php
@ -9,6 +9,8 @@ if (! defined('PHPMYADMIN')) {
    exit;
 }

+require_once './libraries/check_user_privileges.lib.php';
+
 /**
 * Represents a container for database nodes in the navigation tree
 *