sort tags in feedlist output, "technorati tag:" is stripped from tagname

diff --git a/backend.php b/backend.php
index 91853d4b84852165f329c5db1265747988ad34a1..2f1e7c2f8fc09cf6f9fea84d05d641a948a80934 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -258,9 +258,10 @@
                        $result = db_query($link, "SELECT tag_name,count(ttrss_entries.id) AS count
                                FROM ttrss_tags,ttrss_entries WHERE
                                post_id = ttrss_entries.id AND unread = true 
-                               AND ttrss_tags.owner_uid = '$owner_uid' GROUP BY tag_name                               
+                               AND ttrss_tags.owner_uid = '$owner_uid' GROUP BY tag_name       
                        UNION
-                               select tag_name,0 as count FROM ttrss_tags WHERE owner_uid = '$owner_uid'");
+                               select tag_name,0 as count FROM ttrss_tags WHERE owner_uid = '$owner_uid'
+                       ORDER BY tag_name");
        
                        $tags = array();
        

diff --git a/functions.php b/functions.php
index 355226e8d09235de283a4eb0511aa65b05d19946..8bf146d7a798bb91caa158de49b0c1f4f3970a3f 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -403,6 +403,8 @@
                                        foreach ($entry_tags as $tag) {
                                                $tag = db_escape_string(strtolower($tag));
 
+                                               $tag = str_replace("technorati tag: ", "", $tag);
+
                                                $result = db_query($link, "SELECT id FROM ttrss_tags            
                                                        WHERE tag_name = '$tag' AND post_id = '$entry_id' AND 
                                                        owner_uid = ".$_SESSION["uid"]." LIMIT 1");