From b456cb7fdfa85379524d89650d4b32d282cd8210 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@akbkhome.com>
Date: Thu, 16 Sep 2010 12:09:09 +0800
Subject: [PATCH] I18n.php

---
 I18n.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/I18n.php b/I18n.php
index 9f345f43..c0ea3302 100644
--- a/I18n.php
+++ b/I18n.php
@@ -93,11 +93,8 @@ class Pman_Core_i18N extends Pman
         //}
         $this->authUser = $au;
         
-        $opts = PEAR::getStaticProperty('Pman_Core_I18N', 'options');
-        if (empty($opts)) {
-            $opts = PEAR::getStaticProperty('Pman_I18N', 'options');
-        }
-        $opts = empty($opts)  ?  array() : $opts;
+        $ff= HTML_FlexyFramework::get();
+        $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)  : $ff->Pman_Core_I18N;
         
         // load the cofiguration
         foreach($opts as $k=>$v) {
-- 
2.39.2