From: john <john@roojs.com>
Date: Thu, 11 Oct 2018 04:42:05 +0000 (+0800)
Subject: DataObjects/Core_person.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=91f6bb78f320648e914eff800d86e09730717be6

DataObjects/Core_person.php
---

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 673c21c8..025df86e 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -673,17 +673,12 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $aur['dailykey'] = '';
         $aur['oath_key'] = '';
         
-        $aur['oath_key_enable'] = !empty($this->oath_key);
-        
         $s = DB_DataObject::Factory('core_setting');
         $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');
-        
-        if(!empty($oath_require)) {
-            
+        if(empty($oath_require) || $oath_require == 1) {
+            $aur['oath_key_enable'] = !empty($this->oath_key);
         }
-        
-        
-        $aur['require_oath'] = empty($oath_require) || $oath_require == 1 ? 1 : 0;
+        $aur['require_oath'] =  ? 1 : 0;
         
         return $aur;
     }