From fda343afd1e0fe653db06a62a5f7b3d1a91f40e3 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 18 May 2020 20:41:57 +0900 Subject: [PATCH] Set $this->user only once --- classes/module/ModuleHandler.class.php | 5 +++-- classes/module/ModuleObject.class.php | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index a38e065df..fc394406e 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -1229,9 +1229,10 @@ class ModuleHandler extends Handler } // Populate default properties - if($oModule->user === false) + $oModule->user = Context::get('logged_info') ?: new Rhymix\Framework\Helpers\SessionHelper; + if(!($oModule->user instanceof Rhymix\Framework\Helpers\SessionHelper)) { - $oModule->user = Context::get('logged_info') ?: new Rhymix\Framework\Helpers\SessionHelper; + $oModule->user = Rhymix\Framework\Session::getMemberInfo(); } // Load language files for the class diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php index cf209f75a..240bb359f 100644 --- a/classes/module/ModuleObject.class.php +++ b/classes/module/ModuleObject.class.php @@ -47,11 +47,6 @@ class ModuleObject extends BaseObject */ public function __construct($error = 0, $message = 'success') { - $this->user = Context::get('logged_info') ?: new Rhymix\Framework\Helpers\SessionHelper; - if(!($this->user instanceof Rhymix\Framework\Helpers\SessionHelper)) - { - $this->user = Rhymix\Framework\Session::getMemberInfo(); - } parent::__construct($error, $message); }