From 9fcdaf99e24a23724c2b95b29b85b8112b6263fb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Sep 2015 20:52:37 +0200
Subject: Error encoding tag link

https://github.com/FreshRSS/FreshRSS/issues/970
---
 app/views/helpers/index/normal/entry_bottom.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 20b4b332c..66c9d0e74 100644
--- a/app/views/helpers/index/normal/entry_bottom.phtml
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -71,7 +71,7 @@
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li><?php
 				foreach($tags as $tag) {
-					?><li class="item"><a href="<?php echo _url('index', 'index', 'search', urlencode('#' . $tag)); ?>"><?php echo $tag; ?></a></li><?php
+					?><li class="item"><a href="<?php echo _url('index', 'index', 'search', '#' . urlencode($tag)); ?>"><?php echo $tag; ?></a></li><?php
 				} ?>
 			</ul>
 		</div>
-- 
cgit v1.2.3


From d073331d2496d427dad972b9e024f247015e50ce Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Sep 2015 21:31:24 +0200
Subject: Tag link double encoding problem

https://github.com/FreshRSS/FreshRSS/issues/970
Tags coming from the database are already HTML-encoded.
---
 app/views/helpers/index/normal/entry_bottom.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 66c9d0e74..3af7436c3 100644
--- a/app/views/helpers/index/normal/entry_bottom.phtml
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -71,7 +71,7 @@
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li><?php
 				foreach($tags as $tag) {
-					?><li class="item"><a href="<?php echo _url('index', 'index', 'search', '#' . urlencode($tag)); ?>"><?php echo $tag; ?></a></li><?php
+					?><li class="item"><a href="<?php echo _url('index', 'index', 'search', '#' . htmlspecialchars_decode($tag)); ?>"><?php echo $tag; ?></a></li><?php
 				} ?>
 			</ul>
 		</div>
-- 
cgit v1.2.3


From 4cd5608651aaa7e262926a85a4b7ecbdeca6e730 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Sep 2015 21:39:13 +0200
Subject: Changelog Fix tag search link from articles

https://github.com/FreshRSS/FreshRSS/issues/970
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5390d8801..5780942fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Bug fixing
 	* Session cookie bug [#924](https://github.com/FreshRSS/FreshRSS/issues/924)
 	* Better error handling for PubSubHubbub [#939](https://github.com/FreshRSS/FreshRSS/issues/939)
+	* Fix tag search link from articles [#970](https://github.com/FreshRSS/FreshRSS/issues/970)
 
 
 ## 2015-07-30 FreshRSS 1.1.2-beta
-- 
cgit v1.2.3