Merge branch 'QA_4_1'

ChangeLog

@@ -41,6 +41,8 @@ phpMyAdmin - ChangeLog
 - bug #4298 Missing validation on Import CSV: "Columns enclosed with" and "Columns escaped with"
 - bug #4040 Fatal error while resetting settings
 - bug #4305 JS error when editing procedure from nav panel
+- bug #4308 Edit routine form submitting when pressing enter
+- bug #4307 Nav: "Columns" won't expand with specific schema
 
 4.1.8.0 (2014-02-22)
 - bug #4276 Login loop on session expiry

js/rte.js

@@ -714,7 +714,7 @@ RTE.ROUTINE = {
                     /*
                     * Define the function if the user presses enter
                     */
-                    $('form.rte_form').live('keyup', function (event) {
+                    $('form.rte_form').on('keyup', function (event) {
                         event.preventDefault();
                         if (event.keyCode === 13) {
                             /**
@@ -730,6 +730,7 @@ RTE.ROUTINE = {
                                     // Routine executed successfully
                                     PMA_ajaxRemoveMessage($msg);
                                     PMA_slidingMessage(data.message);
+                                    $('form.rte_form').off('keyup');
                                     $ajaxDialog.remove();
                                 } else {
                                     PMA_ajaxShowMessage(data.error, false);

libraries/navigation/NavigationTree.class.php

@@ -819,6 +819,7 @@ class PMA_NavigationTree
             }
             if ($node->is_group
                 || (! in_array($parentName, $sterile) && ! $node->isNew)
+                || (in_array($node->real_name, $sterile))    //if node name itself is in sterile, then allow
             ) {
                 $loaded = '';
                 if ($node->is_group) {