Merge branch 'master' of bah.org.ru:public_html/testbox/tt-rss

[tt-rss.git] / functions.php

diff --git a/functions.php b/functions.php
index 27c07fda87dfd74172e4e591a1431a1c10c9f51b..471f1fe7f70e9c789c9617d6b8b0ab143fbeac45 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -1371,15 +1371,15 @@
 
                                # check for manual tags
 
-                               $tag_filter = find_article_filter($article_filters, "tag"); 
+                               foreach ($article_filters as $f) {
+                                       if ($f[0] == "tag") {
 
-                               if ($tag_filter) {
+                                               $manual_tags = trim_array(split(",", $f[1]));
 
-                                       $manual_tags = trim_array(split(",", $tag_filter[1]));
-
-                                       foreach ($manual_tags as $tag) {
-                                               if (tag_is_valid($tag)) {
-                                                       array_push($entry_tags, $tag);
+                                               foreach ($manual_tags as $tag) {
+                                                       if (tag_is_valid($tag)) {
+                                                               array_push($entry_tags, $tag);
+                                                       }
                                                }
                                        }
                                }