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

This commit is contained in:
Weblate 2016-09-21 17:53:23 +02:00
commit 43c5a3abdc
2 changed files with 2 additions and 1 deletions

View File

@ -41,6 +41,7 @@ phpMyAdmin - ChangeLog
- issue #12298 Fixed export of view definitions
- issue #12242 Edit routine detail dialog does not fill "Return length" field in mysql functions
- issue #12575 New index Confirm adds whitespace around the field name
- issue #12382 Bug in zoom search
4.6.4 (2016-08-16)
- issue [security] Weaknesses with cookie encryption, see PMASA-2016-29

View File

@ -461,7 +461,7 @@ class TableSearchController extends TableController
}
$key = array_search($field, $this->_columnNames);
$search_index = 0;
if (PMA_isValid($_REQUEST['it'], 'integer')) {
if (PMA_isValid(intval($_REQUEST['it']), 'numeric')) {
$search_index = $_REQUEST['it'];
}
$properties = $this->getColumnProperties($search_index, $key);