Merge pull request #16 from GUSSAN-BEEDAN/feature

Update AdminMakeResponsiveViewEventListener.php
GUSSAN-BEEDAN · Aug 26, 2022 · d70bfb3 · d70bfb3
2 parents 9215c13 + 0861a99
commit d70bfb3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Event/AdminMakeResponsiveViewEventListener.php b/Event/AdminMakeResponsiveViewEventListener.php
@@ -24,7 +24,7 @@ public function beforeLayout(CakeEvent $event) {
 		if (BcUtil::loginUser()) {
 		// ログイン時
 			if ((BcUtil::isAdminSystem())
-				&&(Configure::read('BcSite.admin_theme') === 'admin-third' || $View->viewVars['siteConfig']['admin_theme'] === 'admin-third')
+				&&(Configure::read('BcSite.admin_theme') === 'admin-third' || $this->BcBaser->siteConfig['admin_theme'] === 'admin-third')
 			) {
 			// admin-third（管理画面）
 				if (
@@ -65,7 +65,7 @@ public function beforeLayout(CakeEvent $event) {
 					return;
 				}
 			} else if (
-				(Configure::read('BcSite.admin_theme') === 'admin-third' || $View->viewVars['siteConfig']['admin_theme'] === 'admin-third')
+				(Configure::read('BcSite.admin_theme') === 'admin-third' || $this->BcBaser->siteConfig['admin_theme'] === 'admin-third')
 			) {
 			// admin-third（ユーザー画面上管理ツールバー）
 				if (
@@ -121,7 +121,7 @@ public function beforeLayout(CakeEvent $event) {
 				return;
 			}
 		} else if (
-			(Configure::read('BcSite.admin_theme') === 'admin-third' || $View->viewVars['siteConfig']['admin_theme'] === 'admin-third')
+			(Configure::read('BcSite.admin_theme') === 'admin-third' || $this->BcBaser->siteConfig['admin_theme'] === 'admin-third')
 		) {
 		// ログオフ時 admin-third（ログイン画面対象）
 			if (