From: leon <leon@roojs.com>
Date: Thu, 1 Dec 2022 04:53:29 +0000 (+0800)
Subject: fix #7456 - New_Customer_Portal_100_Report
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=f7439d877c901b6dce376a90de99e380549e168c

fix #7456 - New_Customer_Portal_100_Report
---

diff --git a/I18n.php b/I18n.php
index 6536b2f4..9a1292d1 100644
--- a/I18n.php
+++ b/I18n.php
@@ -234,7 +234,13 @@ class Pman_Core_I18n extends Pman
         if (empty($k)) {
             return '??';
         }
-        $fo = &PEAR::getStaticProperty('HTML_Template_Flexy','options');
+
+        if(class_exists('HTML_FlexyFramework2', false)) {
+            $fo = HTML_FlexyFramework2::get()->HTML_Template_Flexy;
+        }
+        else {
+            $fo = &PEAR::getStaticProperty('HTML_Template_Flexy','options');
+        }
         
         $fallback_lang = empty($fo['locale']) ? 'en' : $fo['locale'];