From 880702fc7400dfab88eada5194635f99792a1378 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 26 Mar 2013 10:13:00 +0100
Subject: [PATCH] Fixed static config access in Currency and i18n (fixes #8341)

---
 i18n/i18n.php                 | 2 +-
 model/fieldtypes/Currency.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n/i18n.php b/i18n/i18n.php
index e2b150d57..a16b1993d 100644
--- a/i18n/i18n.php
+++ b/i18n/i18n.php
@@ -1765,7 +1765,7 @@ class i18n extends Object implements TemplateGlobalProvider {
 	 * @return Name of the locale
 	 */
 	public static function get_locale_name($code) {
-		$langs = self::get_locale_list();
+		$langs = self::config()->all_locales;
 		return isset($langs[$code]) ? $langs[$code] : false;
 	}
 	
diff --git a/model/fieldtypes/Currency.php b/model/fieldtypes/Currency.php
index 8517a33a3..a3b831740 100644
--- a/model/fieldtypes/Currency.php
+++ b/model/fieldtypes/Currency.php
@@ -66,7 +66,7 @@ class Currency extends Decimal {
 	
 	public static function setCurrencySymbol($value) {
 		Deprecation::notice('3.2', 'Use the "Currency.currency_symbol" config setting instead');
-		$this->config()->currency_symbol = $value;
+		Currency::config()->currency_symbol = $value;
 	}
 }