From: Tim Otten <totten@civicrm.org>
Date: Thu, 17 Sep 2015 01:50:57 +0000 (-0700)
Subject: CRM_Core_Config - Expose userFrameworkVersion, replyTo, versionCheck, initialized
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=606999eca82beb92e48cfcdc490d1c2841501381;p=civicrm-core.git

CRM_Core_Config - Expose userFrameworkVersion, replyTo, versionCheck, initialized

The first three were migrated to settings; although core no longer accesses them on $config,
we may need to migrate them, and it doesn't hurt to provide them for backward-compatibility.

Initialized was a just a bug.
---

diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php
index 46ff1ec152..1f43b5c4c2 100644
--- a/CRM/Core/Config/MagicMerge.php
+++ b/CRM/Core/Config/MagicMerge.php
@@ -123,12 +123,14 @@ class CRM_Core_Config_MagicMerge {
       'recaptchaOptions' => array('setting'),
       'recaptchaPublicKey' => array('setting'),
       'recaptchaPrivateKey' => array('setting'),
+      'replyTo' => array('setting'),
       'secondDegRelPermissions' => array('setting'),
       'smartGroupCacheTimeout' => array('setting'),
       'timeInputFormat' => array('setting'),
       'userFrameworkLogging' => array('setting'),
       'userFrameworkUsersTableName' => array('setting'),
       'verpSeparator' => array('setting'),
+      'versionCheck' => array('setting'),
       'wkhtmltopdfPath' => array('setting'),
       'wpBasePage' => array('setting'),
       'wpLoadPhp' => array('setting'),
@@ -136,15 +138,16 @@ class CRM_Core_Config_MagicMerge {
       'doNotResetCache' => array('local'),
       'inCiviCRM' => array('local'),
       'userFrameworkFrontend' => array('local'),
-      'initialized' => array('local'),
 
       'dsn' => array('runtime'),
+      'initialized' => array('runtime'),
       'userFramework' => array('runtime'),
       'userFrameworkBaseURL' => array('runtime'),
       'userFrameworkClass' => array('runtime'),
       'userFrameworkDSN' => array('runtime'),
       'useFrameworkRelativeBase' => array('runtime', 'useFrameworkRelativeBase'),
       'userFrameworkURLVar' => array('runtime'),
+      'userFrameworkVersion' => array('runtime'),
       'userPermissionClass' => array('runtime'),
       'userPermissionTemp' => array('runtime'),
       'userSystem' => array('runtime'),
diff --git a/CRM/Core/Config/Runtime.php b/CRM/Core/Config/Runtime.php
index 46c16ae289..95f4810d72 100644
--- a/CRM/Core/Config/Runtime.php
+++ b/CRM/Core/Config/Runtime.php
@@ -61,6 +61,8 @@ class CRM_Core_Config_Runtime {
    */
   public $userFrameworkURLVar = 'q';
 
+  public $userFrameworkVersion;
+
   public $useFrameworkRelativeBase;
 
   public $userHookClass;
@@ -177,6 +179,8 @@ class CRM_Core_Config_Runtime {
       $this->userFrameworkDSN = CIVICRM_UF_DSN;
     }
 
+    $this->userFrameworkVersion = $this->userSystem->getVersion();
+
     // this is dynamically figured out in the civicrm.settings.php file
     if (defined('CIVICRM_CLEANURL')) {
       $this->cleanURL = CIVICRM_CLEANURL;