Move EnumOperators to PMA_Types

phpmyadmin · Apr 26, 2012 · ffaf63b · ffaf63b
1 parent e4e414f
commit ffaf63b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/libraries/Types.class.php b/libraries/Types.class.php
@@ -50,4 +50,17 @@ public function getNullOperators() {
            'IS NOT NULL',
         );
     }
+
+    /**
+     * ENUM search operators
+     *
+     * @return array
+     */
+    public function getEnumOperators() {
+        return array(
+           '=',
+           '!=',
+        );
+    }
+
 }
diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -2901,16 +2901,6 @@
    'NOT BETWEEN',
 );
 
-/**
- * Search operators
- *
- * @global array $cfg['EnumOperators']
- */
-$cfg['EnumOperators'] = array(
-   '=',
-   '!=',
-);
-
 /**
  * Max rows retreived for zoom search
  */

diff --git a/tbl_select.php b/tbl_select.php
@@ -142,7 +142,7 @@
             <td><select name="func[]">
         <?php
         if (strncasecmp($fields_type[$i], 'enum', 4) == 0) {
-            foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) {
+            foreach ($GLOBALS['PMA_Types']->getEnumOperators() as $fc) {
                 echo "\n" . '                        '
                    . '<option value="' . htmlspecialchars($fc) . '">'
                    . htmlspecialchars($fc) . '</option>';

diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
@@ -103,7 +103,7 @@
     // HTML for operators
     $html = '<select name="zoomFunc[]">';
     if (strncasecmp($fields_type[$key], 'enum', 4) == 0) {
-        foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) {
+        foreach ($GLOBALS['PMA_Types']->getEnumOperators() as $fc) {
             $html .= "\n" . '                        '
                 . '<option value="' . htmlspecialchars($fc) . '">'
                 . htmlspecialchars($fc) . '</option>';