X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=I18n.php;h=12ed22dd3edd164e7b46ad5ea0425927a199ae8d;hp=15f1198777992c7f4a6a28569b7a3e61380e63be;hb=443623f47935eb52acd65a3ff0d84eab1fd5a98b;hpb=c22e5d1087d1d03732d67d1f1b7ec616a7a41733

diff --git a/I18n.php b/I18n.php
index 15f11987..12ed22dd 100644
--- a/I18n.php
+++ b/I18n.php
@@ -120,7 +120,7 @@ class Pman_Core_I18n extends Pman
         
         
         $i = DB_DataObject::Factory('I18n');
-        
+        $i->is_active = 1;
         switch($s) {
             case 'Lang':
                  
@@ -231,7 +231,7 @@ class Pman_Core_I18n extends Pman
         if (empty($k)) {
             return '??';
         }
-        $lang = !$au || empty($au->lang ) ? 'en' : is_string($au) ? $au : $au->lang;
+        $lang = !$au || empty($au->lang ) ? 'en' : (is_string($au) ? $au : $au->lang);
         
         // does it need caching?