CRM_Core_BAO_Setting - Don't prefill settings

[civicrm-core.git] / CRM / Core / Invoke.php

diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php
index 7cc88fc74aac8b7bfd4fef0e48ebc53eb864e98d..24c0ecf77e7da2275941c674309b09c6af95ae3f 100644 (file)
--- a/CRM/Core/Invoke.php
+++ b/CRM/Core/Invoke.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
@@ -257,7 +257,7 @@ class CRM_Core_Invoke {
       }
       else {
         $template->assign('urlIsPublic', FALSE);
-        self::versionCheck($template);
+        self::statusCheck($template);
       }
 
       if (isset($item['return_url'])) {
@@ -344,23 +344,19 @@ class CRM_Core_Invoke {
   }
 
   /**
-   * Show the message about CiviCRM versions.
+   * Show status in the footer
    *
    * @param CRM_Core_Smarty $template
    */
-  public static function versionCheck($template) {
+  public static function statusCheck($template) {
     if (CRM_Core_Config::isUpgradeMode()) {
       return;
     }
-    $newerVersion = $securityUpdate = NULL;
-    if (CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'versionAlert', NULL, 1) & 1) {
-      $newerVersion = CRM_Utils_VersionCheck::singleton()->isNewerVersionAvailable();
-    }
-    if (CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'securityUpdateAlert', NULL, 3) & 1) {
-      $securityUpdate = CRM_Utils_VersionCheck::singleton()->isSecurityUpdateAvailable();
-    }
-    $template->assign('newer_civicrm_version', $newerVersion);
-    $template->assign('security_update', $securityUpdate);
+    $statusSeverity = 0;
+    $statusMessage = ts('System status OK');
+    // TODO: get status from CRM_Utils_Check, if cached
+    $template->assign('footer_status_severity', $statusSeverity);
+    $template->assign('footer_status_message', $statusMessage);
   }
 
   /**
@@ -387,7 +383,7 @@ class CRM_Core_Invoke {
     // rebuild word replacement cache - pass false to prevent operations redundant with this fn
     CRM_Core_BAO_WordReplacement::rebuild(FALSE);
 
-    CRM_Core_BAO_Setting::updateSettingsFromMetaData();
+    Civi::service('settings_manager')->flush();
     // Clear js caches
     CRM_Core_Resources::singleton()->flushStrings()->resetCacheCode();
     CRM_Case_XMLRepository::singleton(TRUE);