Remove duplicated code

Author: annda

types/Page.php

@@ -26,28 +26,6 @@ class Page extends AbstractMultiBaseType
         ]
     ];
 
-    /**
-     * Return the current configuration.
-     * Overwrites parent method to migrate deprecated options.
-     *
-     * @return array
-     */
-    public function getConfig()
-    {
-        // migrate autocomplete options 'namespace' and 'postfix' to 'filter'
-        if (empty($this->config['autocomplete']['filter'])) {
-            if (!empty($this->config['autocomplete']['namespace'])) {
-                $this->config['autocomplete']['filter'] = $this->config['autocomplete']['namespace'];
-                unset($this->config['autocomplete']['namespace']);
-            }
-            if (!empty($this->config['autocomplete']['postfix'])) {
-                $this->config['autocomplete']['filter'] .= '.+?' . $this->config['autocomplete']['postfix'] . '$';
-                unset($this->config['autocomplete']['namespace']);
-            }
-        }
-        return $this->config;
-    }
-
     /**
      * Output the stored data
      *
@@ -105,14 +83,6 @@ public function handleAjax()
 
         $filter = $this->config['autocomplete']['filter'];
 
-        // try to use deprecated options namespace and postfix as filter
-        $namespace = $this->config['autocomplete']['namespace'] ?? '';
-        $postfix = $this->config['autocomplete']['postfix'] ?? '';
-        if (!$filter) {
-            $filter = $namespace ? $namespace . ':' : '';
-            $filter .= $postfix ? '.+?' . $postfix . '$' : '';
-        }
-
         // this basically duplicates what we do in ajax_qsearch() but with a filter
         $result = [];
         $counter = 0;
@@ -283,5 +253,17 @@ protected function mergeConfig($current, &$config)
                 $config[$key] = $value;
             }
         }
+
+        // migrate autocomplete options 'namespace' and 'postfix' to 'filter'
+        if (empty($config['autocomplete']['filter'])) {
+            if (!empty($config['autocomplete']['namespace'])) {
+                $config['autocomplete']['filter'] = $config['autocomplete']['namespace'];
+                unset($config['autocomplete']['namespace']);
+            }
+            if (!empty($config['autocomplete']['postfix'])) {
+                $config['autocomplete']['filter'] .= '.+?' . $config['autocomplete']['postfix'] . '$';
+                unset($config['autocomplete']['postfix']);
+            }
+        }
     }
 }