Changed I18n.php

diff --git a/I18n.php b/I18n.php
index 6536b2f..8b6a877 100644 (file)
--- 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)) {
+            die(HTML_FlexyFramework2::get()->HTML_Template_Flexy);
+        }
+        else {
+            $fo = &PEAR::getStaticProperty('HTML_Template_Flexy','options');
+        }
         
         $fallback_lang = empty($fo['locale']) ? 'en' : $fo['locale'];