Pman.js

[Pman.Core] / I18n.php

diff --git a/I18n.php b/I18n.php
index af327e4..12ed22d 100644 (file)
--- 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':
                  
@@ -189,7 +189,8 @@ class Pman_Core_I18n extends Pman
         foreach($langs as $lang)
         {
             //$rlang = array_shift(explode('_', strtoupper($lang)));
-            $rlang = array_shift(explode('_', $lang));
+            $ll = explode('_', $lang);
+            $rlang = array_shift($ll);
             
             $ar[$lang] = array();
             $i = DB_DataObject::Factory('I18n');
@@ -230,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?