summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-09-08 21:44:34 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-09-08 21:44:34 +0200
commit55764935a71594fbe9354bfa0ca8888ca8d79c00 (patch)
treed587a754677381d8d3bb3a254c96a67c4ea80f5b
parent757b879261cd23b56d20de98a63e13a8cae32621 (diff)
parent4cd5608651aaa7e262926a85a4b7ecbdeca6e730 (diff)
Merge pull request #973 from Alkarex/TagBug
Tag link encoding bug
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/views/helpers/index/normal/entry_bottom.phtml2
2 files changed, 2 insertions, 1 deletions
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
diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 20b4b332c..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>