fix baserproject#2987 BcBaserHelper::getThemeUrl()でサブサイトに設定しているテーマURL…

…が取得できない動作を修正
fuchigam1 · Dec 25, 2023 · 4476f8d · 4476f8d
1 parent 34ac3cd
commit 4476f8d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/Baser/Test/Case/View/Helper/BcBaserHelperTest.php b/lib/Baser/Test/Case/View/Helper/BcBaserHelperTest.php
@@ -1967,6 +1967,12 @@ public function testGetThemeUrl()
 		$this->siteConfig['theme'] = 'nada-icons';
 		$expects = $this->BcBaser->request->webroot . 'theme' . '/' . $this->siteConfig['theme'] . '/';
 		$this->assertEquals($expects, $this->BcBaser->getThemeUrl());
+
+		if (!empty($this->BcBaser->request->params['Site']['theme'])) {
+			$theme = $this->BcBaser->request->params['Site']['theme'];
+		}
+		$expects = $this->BcBaser->request->webroot . 'theme' . '/' . $theme . '/';
+		$this->assertEquals($expects, $this->BcBaser->getThemeUrl());
 	}
 
 	/**

diff --git a/lib/Baser/View/Helper/BcBaserHelper.php b/lib/Baser/View/Helper/BcBaserHelper.php
@@ -2454,7 +2454,11 @@ public function getThemeImage($name, $options = [])
 	 */
 	public function getThemeUrl()
 	{
-		return $this->request->webroot . 'theme' . '/' . $this->siteConfig['theme'] . '/';
+		$theme = $this->siteConfig['theme'];
+		if ($this->theme) {
+			$theme = $this->theme;
+		}
+		return $this->request->webroot . 'theme' . DS . $theme . DS;
 	}
 
 	/**