Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
This commit is contained in:
commit
2d0b50f3ba
@ -274,7 +274,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
|
||||
// The where clause
|
||||
if (trim($where) != '') {
|
||||
$sql_query .= ' WHERE ' . $where;
|
||||
} else {
|
||||
} else if (isset($func)) {
|
||||
$w = $charsets = array();
|
||||
$cnt_func = count($func);
|
||||
reset($func);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user