Merge "Workaround image magick issue with greyscale xcf files"

[lhc/web/wiklou.git] / includes / api / ApiQuerySearch.php

diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index d67fac2..1c41113 100644 (file)
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -257,8 +257,6 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
        }
 
        public function getAllowedParams() {
-               global $wgSearchType;
-
                $params = array(
                        'search' => array(
                                ApiBase::PARAM_TYPE => 'string',
@@ -319,7 +317,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
                                $alternatives[0] = self::BACKEND_NULL_PARAM;
                        }
                        $params['backend'] = array(
-                               ApiBase::PARAM_DFLT => $wgSearchType,
+                               ApiBase::PARAM_DFLT => $this->getConfig()->get( 'SearchType' ),
                                ApiBase::PARAM_TYPE => $alternatives,
                        );
                }