Merge branch 'QA_4_4'

1 files changed, 17 insertions, 6 deletions

diff --git a/js/functions.js b/js/functions.js
index 4351c9e86c..528530dcee 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3831,13 +3831,10 @@ AJAX.registerOnload('functions.js', function () {
      * Enables the text generated by PMA_Util::linkOrButton() to be clickable
      */
     $(document).on('click', 'a.formLinkSubmit', function (e) {
-
-        if ($(this).attr('href').indexOf('=') != -1) {
-            var data = $(this).attr('href').substr($(this).attr('href').indexOf('#') + 1).split('=', 2);
-            $(this).parents('form').append('<input type="hidden" name="' + data[0] + '" value="' + data[1] + '"/>');
+        if (! $(this).hasClass('requireConfirm')) {
+            submitFormLink($(this));
+            return false;
         }
-        $(this).parents('form').submit();
-        return false;
     });
 
     if ($('#update_recent_tables').length) {
@@ -3873,6 +3870,20 @@ AJAX.registerOnload('functions.js', function () {
     }
 }); // end of $()
 
+/**
+ * Submits the form placed in place of a link due to the excessive url length
+ *
+ * @param $link anchor
+ * @returns {Boolean}
+ */
+function submitFormLink($link)
+{
+    if ($link.attr('href').indexOf('=') != -1) {
+        var data = $link.attr('href').substr($link.attr('href').indexOf('#') + 1).split('=', 2);
+        $link.parents('form').append('<input type="hidden" name="' + data[0] + '" value="' + data[1] + '"/>');
+    }
+    $link.parents('form').submit();
+}
 
 /**
  * Initializes slider effect.