CRM-19612 Dedupe: dodge problems introduced by query union

[civicrm-core.git] / Civi / Core / SettingsManager.php

diff --git a/Civi/Core/SettingsManager.php b/Civi/Core/SettingsManager.php
index acbf79db2794ed103c109b005bfc1069eb87a285..2e49450d4e445a72f5dc8915ab563f7e9281de9a 100644 (file)
--- a/Civi/Core/SettingsManager.php
+++ b/Civi/Core/SettingsManager.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2016                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -99,7 +99,7 @@ class SettingsManager {
    * Ensure that all defaults values are included with
    * all current and future bags.
    *
-   * @return $this
+   * @return SettingsManager
    */
   public function useDefaults() {
     if (!$this->useDefaults) {
@@ -130,7 +130,7 @@ class SettingsManager {
    * If you call useMandatory multiple times, it will
    * re-scan the global $civicrm_setting.
    *
-   * @return $this
+   * @return SettingsManager
    */
   public function useMandatory() {
     $this->mandatory = NULL;
@@ -293,7 +293,7 @@ class SettingsManager {
   /**
    * Flush all in-memory and persistent caches related to settings.
    *
-   * @return $this
+   * @return SettingsManager
    */
   public function flush() {
     $this->mandatory = NULL;