From: Alan Knowles <alan@roojs.com>
Date: Mon, 18 Aug 2014 07:20:02 +0000 (+0800)
Subject: DataObjects/I18n.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=ee573f6d789c0ea3a852a96594bdb0340f17cbb1;ds=sidebyside

DataObjects/I18n.php
---

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 1cd61f2b..e2ed9cc3 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -70,7 +70,14 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         }
         $loaded =true;
         $ff= HTML_FlexyFramework::get();
-         
+        $opts = array();
+        foreach(array('Pman_Core_I18N', 'Pman_I18N','Pman_I18n') as $pk) {
+            if (isset($ff->$pk)) {
+                $opts=  $ff->$pk;
+                break;
+            }
+        }
+        
         // since our opts array changed alot..
         $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)  : $ff->Pman_Core_I18N;