Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog
 - bug #4276 Login loop on session expiry
 - bug #4249 Incorrect number of result rows for SQL with subqueries
 - bug #4275 Broken Link to php extension manual
+- bug #4053 List of procedures is not displayed after executing with Enter
 
 4.1.7.0 (2014-02-09)
 - bug #4245 initial Browse query does not match sorting order

js/rte.js

@@ -711,6 +711,30 @@ RTE.ROUTINE = {
                     $ajaxDialog.find('input.datefield, input.datetimefield').each(function () {
                         PMA_addDatepicker($(this).css('width', '95%'));
                     });
+                    /*
+                    * Define the function if the user presses enter
+                    */
+                    $('form.rte_form').live('submit', function (event) {
+                        event.preventDefault();
+                        /**
+                         * @var data Form data to be sent in the AJAX request
+                         */
+                        var data = $(this).serialize();
+                        $msg = PMA_ajaxShowMessage(
+                            PMA_messages.strProcessingRequest
+                        );
+                        var url = $(this).attr('action');
+                        $.post(url, data, function (data) {
+                            if (data.success === true) {
+                                // Routine executed successfully
+                                PMA_ajaxRemoveMessage($msg);
+                                PMA_slidingMessage(data.message);
+                                $ajaxDialog.remove();
+                            } else {
+                                PMA_ajaxShowMessage(data.error, false);
+                            }
+                        });
+                    });
                 } else {
                     // Routine executed successfully
                     PMA_slidingMessage(data.message);

libraries/rte/rte_routines.lib.php

@@ -1582,7 +1582,7 @@ function PMA_RTN_getExecuteForm($routine)
     // Create the output
     $retval  = "";
     $retval .= "<!-- START ROUTINE EXECUTE FORM -->\n\n";
-    $retval .= "<form action='db_routines.php' method='post' class='rte_form'>\n";
+    $retval .= "<form action='db_routines.php' method='post' class='rte_form ajax' onsubmit='return false'>\n";
     $retval .= "<input type='hidden' name='item_name'\n";
     $retval .= "       value='{$routine['item_name']}' />\n";
     $retval .= "<input type='hidden' name='item_type'\n";