From 5799b60b0128d57860aba714619098d976f25271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Thu, 26 Apr 2012 11:09:15 +0200
Subject: [PATCH] Use PMA_Types->getTypeClass for getting default function

---
 libraries/common.lib.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index f2813c40d9..30dd3df7c9 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -3676,18 +3676,17 @@ function PMA_getFunctionsForField($field, $insert_mode)
     global $cfg, $analyzed_sql, $data;
 
     $selected = '';
-    // Find the current type in the RestrictColumnTypes. Will result in 'FUNC_CHAR'
-    // or something similar. Then directly look up the entry in the
-    // RestrictFunctions array, which'll then reveal the available dropdown options
-    if (isset($cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])])
-        && isset($cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])]])
-    ) {
+    $dropdown = array();
+    $default_function   = '';
+
+    // Can we get field class based values?
+    $current_class = $GLOBALS['PMA_Types']->getTypeClass($field['True_Type']);
+    if (! empty($current_class)) {
         $current_func_type  = $cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])];
         $dropdown           = $cfg['RestrictFunctions'][$current_func_type];
-        $default_function   = $cfg['DefaultFunctions'][$current_func_type];
-    } else {
-        $dropdown = array();
-        $default_function   = '';
+        if (isset($cfg['DefaultFunctions']['FUNC_' . $current_class])) {
+            $default_function   = $cfg['DefaultFunctions']['FUNC_' . $current_class];
+        }
     }
     $dropdown_built = array();
     $op_spacing_needed = false;