Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

ChangeLog

@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #3521313 [core] Call to undefined function __()
 - bug #3521016 [edit] NOW() function incorrectly selected
 - bug [GUI] Invalid HTML code on transformation_overview.php
+- bug #3522930 [browse] Missing validation in Ajax mode
 
 3.5.1.0 (not yet released)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered

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');

js/sql.js

@@ -289,16 +289,27 @@ $(document).ready(function() {
          */
         var $form = $(this).parent("form");
 
-        PMA_prepareForAjaxRequest($form);
+        if (checkFormElementInRange(
+                $form[0], 
+                'session_max_rows', 
+                PMA_messages['strNotValidRowNumber'], 1)
+            &&
+            checkFormElementInRange(
+                $form[0], 
+                'pos', 
+                PMA_messages['strNotValidRowNumber'], 0)) {
 
-        $.post($form.attr('action'), $form.serialize(), function(data) {
-            $("#sqlqueryresults")
-             .html(data)
-             .trigger('makegrid');
-            PMA_init_slider();
+            PMA_prepareForAjaxRequest($form);
 
-            PMA_ajaxRemoveMessage($msgbox);
-        }); // end $.post()
+            $.post($form.attr('action'), $form.serialize(), function(data) {
+                $("#sqlqueryresults")
+                 .html(data)
+                 .trigger('makegrid');
+                PMA_init_slider();
+
+                PMA_ajaxRemoveMessage($msgbox);
+            }); // end $.post()
+        }
     }); // end Paginate results table
 
     /**