From: Tim Otten Date: Mon, 17 Aug 2015 00:54:57 +0000 (-0700) Subject: CRM-16373 - Config - Remove `civiVersion` property X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=10e2f48b595bbd3aa55c2d6dcb5bca78659a78c1;p=civicrm-core.git 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 249c073b35..2941524f61 100644 --- 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 71b1b31b87..6dabce65de 100644 --- 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 (requested extensions from here). If you want to install an extension which is not marked as compatible, you may be able to download and install extensions manually (depending on access to your web server).
', 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'); }