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

DataObjects/I18n.php
---

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index e2ed9cc3..86790e67 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -70,6 +70,8 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         }
         $loaded =true;
         $ff= HTML_FlexyFramework::get();
+        
+        // BC compatible.. if any of these are set, then we use them as the settings..
         $opts = array();
         foreach(array('Pman_Core_I18N', 'Pman_I18N','Pman_I18n') as $pk) {
             if (isset($ff->$pk)) {
@@ -78,8 +80,6 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             }
         }
         
-        // since our opts array changed alot..
-        $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)  : $ff->Pman_Core_I18N;
         
          
        //  var_dump($opts);exit;