<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013 |
+ | Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
* it need to be defined here first.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
* $Id$
*
*/
* Path to wkhtmltopdf if available
*/
public $wkhtmltopdfPath = FALSE;
-
+
/**
* Allow second-degree relations permission to edit contacts
*/
public $secondDegRelPermissions = FALSE;
-
+
/**
* Allow second-degree relations permission to edit contacts
static $cachedSymbol = NULL;
if (!$cachedSymbol || $defaultCurrency) {
if ($this->defaultCurrency || $defaultCurrency) {
- $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);
+ $this->currencySymbols = CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'currency', array(
+ 'labelColumn' => 'symbol',
+ 'orderColumn' => TRUE,
+ ));
$currency = $defaultCurrency ? $defaultCurrency : $this->defaultCurrency;
$cachedSymbol = CRM_Utils_Array::value($currency, $this->currencySymbols, '');
}
$country = array();
if (is_array($this->provinceLimit)) {
foreach ($this->provinceLimit as $val) {
- $country[] = $countryIsoCodes[$val];
+ // CRM-12007
+ // some countries have disappeared and hence they might be in country limit
+ // but not in the country table
+ if (isset($countryIsoCodes[$val])) {
+ $country[] = $countryIsoCodes[$val];
+ }
}
}
else {