Merge branch 'QA_3_5'

2 files changed, 21 insertions, 9 deletions

diff --git a/js/messages.php b/js/messages.php
index ce016e8015..b131b1ff35 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -285,6 +285,7 @@ $js_messages['strEdit'] = __('Edit');
 $js_messages['strNoRowSelected'] = __('No rows selected');
 $js_messages['strChangeTbl'] = __('Change');
 $js_messages['strQueryExecutionTime'] = __('Query execution time');
+$js_messages['strNotValidRowNumber'] = __('%d is not valid row number.');
 
 /* For server_variables.js */
 $js_messages['strSave'] = __('Save');
diff --git a/js/sql.js b/js/sql.js
index 58663dd592..6fb7632e0b 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -286,16 +286,27 @@ $(function() {
          */
         var $form = $(this).parent("form");
 
-        PMA_prepareForAjaxRequest($form);
-
-        $.post($form.attr('action'), $form.serialize(), function(data) {
-            $("#sqlqueryresults")
-             .html(data)
-             .trigger('makegrid');
-            PMA_init_slider();
+        if (checkFormElementInRange(
+                $form[0], 
+                'session_max_rows', 
+                PMA_messages['strNotValidRowNumber'], 1)
+            &&
+            checkFormElementInRange(
+                $form[0], 
+                'pos', 
+                PMA_messages['strNotValidRowNumber'], 0)) {
+
+            PMA_prepareForAjaxRequest($form);
+
+            $.post($form.attr('action'), $form.serialize(), function(data) {
+                $("#sqlqueryresults")
+                 .html(data)
+                 .trigger('makegrid');
+                PMA_init_slider();
 
-            PMA_ajaxRemoveMessage($msgbox);
-        }); // end $.post()
+                PMA_ajaxRemoveMessage($msgbox);
+            }); // end $.post()
+        }
     }); // end Paginate results table
 
     /**