getTagLinkUrlで取得するタグの名称をurlエンコード

baserproject · Jan 23, 2025 · 3ff0a93 · 3ff0a93
1 parent ceed85c
commit 3ff0a93
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/lib/Baser/Plugin/Blog/Test/Case/View/Helper/BlogHelperTest.php b/lib/Baser/Plugin/Blog/Test/Case/View/Helper/BlogHelperTest.php
@@ -804,10 +804,10 @@ public function testTagList($expected, $name, $options = [])
 	public function tagListDataProvider()
 	{
 		return [
-			['/(?=\/tag\/タグ１).*?(?!.*\/tag\/タグ２).*?(?!.*\/tag\/タグ３)/s', 'blog1'],
-			['/(?=\/tag\/タグ１).*?(?=\/tag\/タグ２).*?(?=\/tag\/タグ３)/s', '/s/blog3/'],
-			['/(?=\/tags\/タグ１).*?(?=\/tags\/タグ２).*?(?=\/tags\/タグ３).*?(?=\/tags\/タグ４).*?(?=\/tags\/タグ５)/s', null],
-			['/(?=\/tag\/タグ１).*?\(2\)/s', 'blog1', ['postCount' => true]],
+			['/(?=\/tag\/%E3%82%BF%E3%82%B0%EF%BC%91).*?(?!.*\/tag\/%E3%82%BF%E3%82%B0%EF%BC%92).*?(?!.*\/tag\/%E3%82%BF%E3%82%B0%EF%BC%93)/s', 'blog1'],
+			['/(?=\/tag\/%E3%82%BF%E3%82%B0%EF%BC%91).*?(?=\/tag\/%E3%82%BF%E3%82%B0%EF%BC%92).*?(?=\/tag\/%E3%82%BF%E3%82%B0%EF%BC%93)/s', '/s/blog3/'],
+			['/(?=\/tags\/%E3%82%BF%E3%82%B0%EF%BC%91).*?(?=\/tags\/%E3%82%BF%E3%82%B0%EF%BC%92).*?(?=\/tags\/%E3%82%BF%E3%82%B0%EF%BC%93).*?(?=\/tags\/%E3%82%BF%E3%82%B0%EF%BC%94).*?(?=\/tags\/%E3%82%BF%E3%82%B0%EF%BC%95)/s', null],
+			['/(?=\/tag\/%E3%82%BF%E3%82%B0%EF%BC%91).*?\(2\)/s', 'blog1', ['postCount' => true]],
 		];
 	}
 
@@ -836,13 +836,13 @@ public function testGetTagLinkUrl($currentUrl, $blogContentId, $name, $base, $us
 	public function getTagLinkUrlDataProvider()
 	{
 		return [
-			['/', 1, 'タグ１', '', false, '/news/archives/tag/タグ１'],
-			['/', 1, 'タグ１', '/sub', false, '/news/archives/tag/タグ１'],
-			['/', 1, 'タグ１', '/sub', true, '/sub/news/archives/tag/タグ１'],
-			['/en/', 3, 'タグ２', '', false, '/en/news/archives/tag/タグ２'],
-			['/', 4, 'タグ２', '', false, 'http://sub.main.com/news/archives/tag/タグ２'],
-			['/', null, 'タグ１', '', false, '/tags/タグ１'],
-			['/s/', null, 'タグ２', '', false, '/s/tags/タグ２']
+			['/', 1, 'タグ１', '', false, '/news/archives/tag/%E3%82%BF%E3%82%B0%EF%BC%91'],
+			['/', 1, 'タグ１', '/sub', false, '/news/archives/tag/%E3%82%BF%E3%82%B0%EF%BC%91'],
+			['/', 1, 'タグ１', '/sub', true, '/sub/news/archives/tag/%E3%82%BF%E3%82%B0%EF%BC%91'],
+			['/en/', 3, 'タグ２', '', false, '/en/news/archives/tag/%E3%82%BF%E3%82%B0%EF%BC%92'],
+			['/', 4, 'タグ２', '', false, 'http://sub.main.com/news/archives/tag/%E3%82%BF%E3%82%B0%EF%BC%92'],
+			['/', null, 'タグ１', '', false, '/tags/%E3%82%BF%E3%82%B0%EF%BC%91'],
+			['/s/', null, 'タグ２', '', false, '/s/tags/%E3%82%BF%E3%82%B0%EF%BC%92']
 		];
 	}
 
@@ -871,10 +871,10 @@ public function testGetTagLink($expected, $currentUrl, $blogContentId, $name)
 	public function getTagLinkDataProvider()
 	{
 		return [
-			['<a href="/news/archives/tag/タグ１">タグ１</a>', '/', 1, 'タグ１'],
-			['<a href="/s/blog3/archives/tag/タグ２">タグ２</a>', '/s/', 3, 'タグ２'],
-			['<a href="/tags/タグ１">タグ１</a>', '/', null, 'タグ１'],
-			['<a href="/s/tags/タグ２">タグ２</a>', '/s/', null, 'タグ２']
+			['<a href="/news/archives/tag/%E3%82%BF%E3%82%B0%EF%BC%91">タグ１</a>', '/', 1, 'タグ１'],
+			['<a href="/s/blog3/archives/tag/%E3%82%BF%E3%82%B0%EF%BC%92">タグ２</a>', '/s/', 3, 'タグ２'],
+			['<a href="/tags/%E3%82%BF%E3%82%B0%EF%BC%91">タグ１</a>', '/', null, 'タグ１'],
+			['<a href="/s/tags/%E3%82%BF%E3%82%B0%EF%BC%92">タグ２</a>', '/s/', null, 'タグ２']
 		];
 	}
 

diff --git a/lib/Baser/Plugin/Blog/View/Helper/BlogHelper.php b/lib/Baser/Plugin/Blog/View/Helper/BlogHelper.php
@@ -1452,11 +1452,11 @@ public function getTagLinkUrl($blogContentId, $tag, $base = true)
 			if (!empty($this->content['url'])) {
 				$site = BcSite::findByUrl($this->content['url']);
 				$url = $this->BcBaser->getContentsUrl($this->content['url'], !$this->isSameSiteBlogContent($blogContentId), !empty($site->useSubDomain), false);
-				$url = $url . 'archives/tag/' . $tag['name'];
+				$url = $url . 'archives/tag/' . rawurlencode($tag['name']);
 			}
 		}
 		if (!$url) {
-			$url = '/tags/' . $tag['name'];
+			$url = '/tags/' . rawurlencode($tag['name']);
 			$site = BcSite::findCurrent(true);
 			if ($site && $site->alias && !$site->useSubDomain) {
 				$url = '/' . $site->alias . $url;