From f1f3b3947477a28b59b60881cd7587e997ff97c7 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Sun, 24 Feb 2013 21:02:39 +0800 Subject: [PATCH] fix stuff --- DataObjects/Core_enum.php | 2 +- DataObjects/I18n.php | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php index 7cff2250..72a50e55 100644 --- 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 15cb92a8..2f1efe6c 100644 --- 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; } -- 2.39.2