gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-10-24 14:25:43 +02:00
commit 282eb4bcdd
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/DBQbe.class.php
View File

@ -989,7 +989,11 @@ class PMA_DbQbe
{
$orderby_clause = '';
$orderby_clauses = array();
for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++) {
for (
$column_index = 0;
$column_index < $this->_criteria_column_count;
$column_index++
) {
// if all columns are chosen with * selector,
// then sorting isn't available
// Fix for Bug #570698
@ -1182,7 +1186,11 @@ class PMA_DbQbe
$where_clause_columns = array();
$where_clause_tables = array();
// Now we need all tables that we have in the where clause
for ($column_index = 0; $column_index < count($this->_criteria); $column_index++) {
for (
$column_index = 0;
$column_index < count($this->_criteria);
$column_index++
) {
$current_table = explode('.', $_POST['criteriaColumn'][$column_index]);
if (empty($current_table[0]) || empty($current_table[1])) {
continue;