Merge pull request #8025 from monishdeb/CRM-18236

[civicrm-core.git] / CRM / Utils / QueryFormatter.php

diff --git a/CRM/Utils/QueryFormatter.php b/CRM/Utils/QueryFormatter.php
index e4d8af9e9f5a76315e56ae0912e94ec64671a6d7..bdbabea97e326aec367eca2f471f352187d83e3d 100644 (file)
--- a/CRM/Utils/QueryFormatter.php
+++ b/CRM/Utils/QueryFormatter.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -26,9 +26,9 @@
  */
 
  /**
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- */
+  * @package CRM
+  * @copyright CiviCRM LLC (c) 2004-2016
+  */
 
 /**
  * Class CRM_Utils_QueryFormatter
@@ -81,14 +81,14 @@ class CRM_Utils_QueryFormatter {
    */
   public static function singleton($fresh = FALSE) {
     if ($fresh || self::$singleton === NULL) {
-      $mode = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SEARCH_PREFERENCES_NAME, 'fts_query_mode', NULL, self::MODE_NONE);
+      $mode = Civi::settings()->get('fts_query_mode');
       self::$singleton = new CRM_Utils_QueryFormatter($mode);
     }
     return self::$singleton;
   }
 
   /**
-   * @var string 
+   * @var string
    *   eg MODE_NONE
    */
   protected $mode;