Merge branch 'master' of http://private.akbkhome.com/Pman.Base

diff --git a/Pman/I18N.php b/Pman/I18N.php
index 39ceee4..dee3df6 100644 (file)
--- a/Pman/I18N.php
+++ b/Pman/I18N.php
@@ -276,7 +276,7 @@ class Pman_I18N extends Pman_Core_I18n
         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);
         $lbits = explode('_', strtoupper($lang));
         $lang = $lbits[0];
         

diff --git a/Pman/Login.php b/Pman/Login.php
index f8e36d8..f103e9a 100644 (file)
--- a/Pman/Login.php
+++ b/Pman/Login.php
@@ -94,6 +94,7 @@ class Pman_Login extends Pman
         $au = $u->getAuthUser();
         // might occur on shared systems.
         $ff= HTML_FlexyFramework::get();
+        
         if (!empty($ff->Pman['auth_comptype']) && $ff->Pman['auth_comptype'] != $au->company()->comptype) {
             $au->logout();
             $this->jerr("Login not permited to outside companies - please reload");