diff options
| -rw-r--r-- | tbl_select.php | 2 | ||||
| -rw-r--r-- | tbl_zoom_select.php | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tbl_select.php b/tbl_select.php index 507bd963c7..1ead3fd113 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -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); diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index b886267e38..80c93f61ba 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -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 |