dever vor 3 Jahren
Ursprung
Commit
ffa6226a32
1 geänderte Dateien mit 57 neuen und 55 gelöschten Zeilen
  1. 57 55
      src/Database.php

+ 57 - 55
src/Database.php

@@ -560,72 +560,74 @@ class Database
                     $config['manage']['search_child'][$k] = $v['search_parent'];
                 }
 
-                if (isset($v['search']) && is_string($v['search'])) {
-
-                    if ($v['search'] == 'sday') {
-                        $config['manage']['search']['sday'][$k] = $v['name'];
-                    } elseif ($v['search'] == 'sdate') {
-                        $config['manage']['search']['sdate'][$k] = $v['name'];
-                    } elseif (strpos($v['search'], 'time') !== false || strpos($v['search'], 'day') !== false) {
-                        $config['manage']['search']['day'][$k] = $v['name'];
-                    } elseif (strpos($v['search'], 'date') !== false) {
-                        $config['manage']['search']['date'][$k] = $v['name'];
-                    } elseif (strpos($v['search'], 'year') !== false) {
-                        $config['manage']['search']['year'][$k] = $v['name'];
-                    } elseif (strpos($v['search'], 'month') !== false) {
-                        $config['manage']['search']['month'][$k] = $v['name'];
-                    }
+                if (!isset($config['manage']['search'])) {
+                    if (isset($v['search']) && is_string($v['search'])) {
+
+                        if ($v['search'] == 'sday') {
+                            $config['manage']['search']['sday'][$k] = $v['name'];
+                        } elseif ($v['search'] == 'sdate') {
+                            $config['manage']['search']['sdate'][$k] = $v['name'];
+                        } elseif (strpos($v['search'], 'time') !== false || strpos($v['search'], 'day') !== false) {
+                            $config['manage']['search']['day'][$k] = $v['name'];
+                        } elseif (strpos($v['search'], 'date') !== false) {
+                            $config['manage']['search']['date'][$k] = $v['name'];
+                        } elseif (strpos($v['search'], 'year') !== false) {
+                            $config['manage']['search']['year'][$k] = $v['name'];
+                        } elseif (strpos($v['search'], 'month') !== false) {
+                            $config['manage']['search']['month'][$k] = $v['name'];
+                        }
 
-                    if (strpos($v['search'], 'exp') !== false) {
-                        $config['manage']['search']['exp'][$k] = $v['name'];
-                    }
+                        if (strpos($v['search'], 'exp') !== false) {
+                            $config['manage']['search']['exp'][$k] = $v['name'];
+                        }
 
-                    if (strpos($v['search'], 'ins') !== false) {
-                        $config['manage']['search']['ins'][$k] = $v['name'];
-                    }
+                        if (strpos($v['search'], 'ins') !== false) {
+                            $config['manage']['search']['ins'][$k] = $v['name'];
+                        }
 
-                    if (strpos($v['search'], 'fulltext') !== false) {
-                        $config['manage']['search']['fulltext'][$k] = $v['name'];
+                        if (strpos($v['search'], 'fulltext') !== false) {
+                            $config['manage']['search']['fulltext'][$k] = $v['name'];
 
-                        isset($v['match']) && $config['request']['list']['option'][$k] = array('option', 'like_score');
-                    } elseif (strpos($v['search'], 'text') !== false) {
-                        $config['manage']['search']['text'][$k] = $v['name'];
-                    } elseif (strpos($v['search'], 'hidden') !== false) {
-                        $config['manage']['search']['hidden'][$k] = $v['name'];
-                    }
+                            isset($v['match']) && $config['request']['list']['option'][$k] = array('option', 'like_score');
+                        } elseif (strpos($v['search'], 'text') !== false) {
+                            $config['manage']['search']['text'][$k] = $v['name'];
+                        } elseif (strpos($v['search'], 'hidden') !== false) {
+                            $config['manage']['search']['hidden'][$k] = $v['name'];
+                        }
 
-                    if (isset($v['exist']) && strpos($v['search'], 'exist') !== false) {
-                        $config['manage']['search']['exist'][$k]['option'] = $v['exist'];
-                        $config['manage']['search']['exist'][$k]['lang'] = $v['name'];
-                    }
+                        if (isset($v['exist']) && strpos($v['search'], 'exist') !== false) {
+                            $config['manage']['search']['exist'][$k]['option'] = $v['exist'];
+                            $config['manage']['search']['exist'][$k]['lang'] = $v['name'];
+                        }
 
-                    if (isset($v['option']) && strpos($v['search'], 'select') !== false) {
-                        $config['manage']['search']['select'][$k]['option'] = $v['option'];
-                        $config['manage']['search']['select'][$k]['lang'] = $v['name'];
-                        if (isset($v['default'])) {
-                            $config['manage']['search']['select'][$k]['default'] = $v['default'];
+                        if (isset($v['option']) && strpos($v['search'], 'select') !== false) {
+                            $config['manage']['search']['select'][$k]['option'] = $v['option'];
+                            $config['manage']['search']['select'][$k]['lang'] = $v['name'];
+                            if (isset($v['default'])) {
+                                $config['manage']['search']['select'][$k]['default'] = $v['default'];
+                            }
                         }
-                    }
 
-                    if (isset($v['option']) && strpos($v['search'], 'group') !== false) {
-                        $config['manage']['search']['group'][$k]['option'] = $v['option'];
-                        $config['manage']['search']['group'][$k]['lang'] = $v['name'];
-                        if (isset($v['default'])) {
-                            $config['manage']['search']['group'][$k]['default'] = $v['default'];
+                        if (isset($v['option']) && strpos($v['search'], 'group') !== false) {
+                            $config['manage']['search']['group'][$k]['option'] = $v['option'];
+                            $config['manage']['search']['group'][$k]['lang'] = $v['name'];
+                            if (isset($v['default'])) {
+                                $config['manage']['search']['group'][$k]['default'] = $v['default'];
+                            }
                         }
-                    }
 
-                    if (isset($v['option']) && strpos($v['search'], 'linkage') !== false) {
-                        $config['manage']['search']['linkage'][$k]['option'] = $v['option'];
-                        $config['manage']['search']['linkage'][$k]['lang'] = $v['name'];
-                        if (isset($v['default'])) {
-                            $config['manage']['search']['linkage'][$k]['default'] = $v['default'];
+                        if (isset($v['option']) && strpos($v['search'], 'linkage') !== false) {
+                            $config['manage']['search']['linkage'][$k]['option'] = $v['option'];
+                            $config['manage']['search']['linkage'][$k]['lang'] = $v['name'];
+                            if (isset($v['default'])) {
+                                $config['manage']['search']['linkage'][$k]['default'] = $v['default'];
+                            }
+                        }
+                    } elseif (isset($v['search']) && is_array($v['search'])) {
+                        if (isset($v['search']['api'])) {
+                            $config['manage']['search']['api'][$k] = $v['search'];
+                            $config['manage']['search']['api'][$k]['lang'] = $v['name'];
                         }
-                    }
-                } elseif (isset($v['search']) && is_array($v['search'])) {
-                    if (isset($v['search']['api'])) {
-                        $config['manage']['search']['api'][$k] = $v['search'];
-                        $config['manage']['search']['api'][$k]['lang'] = $v['name'];
                     }
                 }