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

Use isUnaryOperator method

Browse Source
This commit is contained in:
Michal Čihař 2012-04-25 15:17:17 +02:00
parent a2bf814f57
commit c1940d2b4f
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tbl_select.php
View File

@ -299,7 +299,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
while (list($i, $func_type) = each($func)) {
list($charsets[$i]) = explode('_', $collations[$i]);
$unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) ? true : false;
$unaryFlag = $GLOBALS['PMA_Types']->isUnaryOperator($func_type) ? true : false;
$tmp_geom_func = isset($geom_func[$i]) ? $geom_func[$i] : null;
$whereClause = PMA_tbl_search_getWhereClause($fields[$i], $names[$i], $types[$i], $collations[$i], $func_type, $unaryFlag, $tmp_geom_func);

5
tbl_zoom_select.php
View File

@ -358,10 +358,7 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null'
$cnt_func = count($zoomFunc[$i]);
$func_type = $zoomFunc[$i];
list($charsets[$i]) = explode('_', $collations[$i]);
$unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type])
&& $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1)
? true
: false;
$unaryFlag = $GLOBALS['PMA_Types']->isUnaryOperator($func_type) ? true : false;
$whereClause = PMA_tbl_search_getWhereClause(
$fields[$i], $inputs[$i], $types[$i],
$collations[$i], $func_type, $unaryFlag