Refactored out of CRM_Core_PseudoConstant: ufGroup(), currencySymbols(). CRM-12464

[civicrm-core.git] / CRM / Core / Config / Variables.php

diff --git a/CRM/Core/Config/Variables.php b/CRM/Core/Config/Variables.php
index f92f643c08572604341d38537f7ffb7af299d819..c06c81e55f0bbd5a93c6f9e41d3ba1fb4988ebe4 100644 (file)
--- a/CRM/Core/Config/Variables.php
+++ b/CRM/Core/Config/Variables.php
@@ -452,6 +452,11 @@ class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
    * Path to wkhtmltopdf if available
    */
   public $wkhtmltopdfPath = FALSE;
+  
+  /**
+   * Allow second-degree relations permission to edit contacts
+   */
+  public $wpBasePage = NULL;
 
   /**
    * Provide addressSequence
@@ -479,8 +484,8 @@ class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
     static $cachedSymbol = NULL;
     if (!$cachedSymbol || $defaultCurrency) {
       if ($this->defaultCurrency || $defaultCurrency) {
-        $currencySymbolName = CRM_Core_PseudoConstant::currencySymbols('name');
-        $currencySymbol = CRM_Core_PseudoConstant::currencySymbols();
+        $currencySymbolName = CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'currency', array('labelColumn' => 'name'));
+        $currencySymbol = CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'currency');
 
         $this->currencySymbols = array_combine($currencySymbolName, $currencySymbol);
         $currency = $defaultCurrency ? $defaultCurrency : $this->defaultCurrency;