From 80063b6856497bb27079905cae4348b86c879f25 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 10 May 2017 10:27:14 +0900 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=9C=9F=E5=8C=96=E6=BC=8F=E3=82=8C?= =?UTF-8?q?=20https://github.com/NetCommons3/NetCommons3/issues/821?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Utility/CurrentBase.php | 2 +- Utility/CurrentFrame.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Utility/CurrentBase.php b/Utility/CurrentBase.php index 8b2e085c..fc82b0ea 100644 --- a/Utility/CurrentBase.php +++ b/Utility/CurrentBase.php @@ -326,7 +326,7 @@ public static function permission($key, $roomId = null) { return false; } if (! $roomId) { - $roomId = Hash::get(self::$current, 'Room.id'); + $roomId = self::read('Room.id'); } $path = 'Permission.' . $key . '.value'; diff --git a/Utility/CurrentFrame.php b/Utility/CurrentFrame.php index e3a65c38..2438b157 100644 --- a/Utility/CurrentFrame.php +++ b/Utility/CurrentFrame.php @@ -55,7 +55,10 @@ public function initialize() { * @return void */ public function clear() { - $models = ['Room', 'RoomRolePermission', 'RolesRoom', 'Frame', 'Block', 'BlockRolePermission']; + $models = [ + 'Room', 'RoomRolePermission', 'RolesRoom', 'Frame', 'Block', 'BlockRolePermission', + 'RolesRoomsUser', 'Permission' + ]; foreach ($models as $model) { if (isset(Current::$current[$model])) { unset(Current::$current[$model]);