Merge remote-tracking branch 'origin/master'

tbl_select.php

@@ -137,7 +137,7 @@ echo PMA_generateHtmlTabs(PMA_tbl_getSubTabs(), $url_params, 'topmenu2');
             <td><select name="func[]">
         <?php
         echo $GLOBALS['PMA_Types']->getTypeOperatorsHtml(
-            $fields_type[$i],
+            preg_replace('@\(.*@s', '', $fields_type[$i]),
             $fields_null[$i]
         );
         ?>

tbl_zoom_select.php

@@ -112,7 +112,7 @@ if (isset($_REQUEST['change_tbl_info']) && $_REQUEST['change_tbl_info'] == true)
     // HTML for operators
     $html = '<select name="zoomFunc[]">';
     $html .= $GLOBALS['PMA_Types']->getTypeOperatorsHtml(
-        $fields_type[$key],
+        preg_replace('@\(.*@s', '', $fields_type[$i]),
         $fields_null[$key]
     );
     $html .= '</select>';
@@ -251,7 +251,7 @@ for ($i = 0; $i < 4; $i++) {
     </tr>
     <tr><td>
     <input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>"
-    <?php 
+    <?php
     if (isset($_POST['types'][$i])) {
         echo 'value="' . $_POST['types'][$i] . '"';
     }