CRM-16373 - Config - Remove `civiVersion` property

Only used once in the entire codebase, and it can be fetched
directly (without any weird statefulness).

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index 249c073b35213679ef11d69a123b3f844ef00a75..2941524f61470d0eb83695d8be74f04a8d6f3a05 100644 (file)
--- a/CRM/Core/BAO/ConfigSetting.php
+++ b/CRM/Core/BAO/ConfigSetting.php
@@ -78,9 +78,6 @@ class CRM_Core_BAO_ConfigSetting {
         $params['civiRelativeURL']
       );
 
-    // also add the version number for use by template / js etc
-    $params['civiVersion'] = CRM_Utils_System::version();
-
     $domain = new CRM_Core_DAO_Domain();
     $domain->id = CRM_Core_Config::domainID();
     $domain->find(TRUE);

diff --git a/CRM/Extension/Browser.php b/CRM/Extension/Browser.php
index 71b1b31b87bf49194746e6c8a3fe5c75a363252d..6dabce65de6c7d47cf0a7eda58ee1c681d337df4 100644 (file)
--- a/CRM/Extension/Browser.php
+++ b/CRM/Extension/Browser.php
@@ -264,7 +264,7 @@ class CRM_Extension_Browser {
       $config = CRM_Core_Config::singleton();
       CRM_Core_Session::setStatus(ts('There are currently no extensions on the CiviCRM public extension directory which are compatible with version %2 (<a href="%1">requested extensions from here</a>). If you want to install an extension which is not marked as compatible, you may be able to <a href="%3">download and install extensions manually</a> (depending on access to your web server).<br />', array(
         1 => $this->getRepositoryUrl(),
-        2 => $config->civiVersion,
+        2 => CRM_Utils_System::version(),
         3 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Extensions',
       )), ts('No Extensions Available for this Version'), 'info');
     }