fix stuff

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 7cff225..72a50e5 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -182,7 +182,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             $t->setFrom($row);
             $t->setFrom($base);
             unset($t->seqid); // these might have been changed
-            unset($t->displayName); // these might have been changed
+            unset($t->display_name); // these might have been changed
             
             
             if (!$t->find(true))

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 15cb92a..2f1efe6 100644 (file)
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -118,11 +118,17 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         
         $x = DB_DataObject::factory('i18n');
         $x->ltype = $ltype;
-        $x->inlang= $inlang;
         $x->lkey = $kval;
+        $x->inlang= $inlang;
+        $fallback = clone($x);
+        
         $x->limit(1);
-        $x->find(true);
-        return $x->lval;
+        if ($x->find(true)) {
+            return $x->lval;
+        }
+        $fallback->inlang = 'en';
+        $fallback->find(true);
+        return $fallback->lval;
         
     }