feedbrowser_cache & linked feeds: add site url (bump schema)

[tt-rss.git] / functions.php

diff --git a/functions.php b/functions.php
index 7fd9df780a3a3a0b11f3212321e3fc5018b86a95..3978e5af9698bb966b793d6888561abafd2d1af0 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -5881,11 +5881,11 @@
 
        function update_feedbrowser_cache($link) {
 
-               $result = db_query($link, "SELECT feed_url,title, COUNT(id) AS subscribers
+               $result = db_query($link, "SELECT feed_url, site_url, title, COUNT(id) AS subscribers
                        FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
                                WHERE tf.feed_url = ttrss_feeds.feed_url
                                AND (private IS true OR feed_url LIKE '%:%@%/%'))
-                               GROUP BY feed_url, title ORDER BY subscribers DESC LIMIT 1000");
+                               GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT 1000");
 
                db_query($link, "BEGIN");
 
@@ -5897,6 +5897,7 @@
                        $subscribers = db_escape_string($line["subscribers"]);
                        $feed_url = db_escape_string($line["feed_url"]);
                        $title = db_escape_string($line["title"]);
+                       $site_url = db_escape_string($line["site_url"]);
 
                        $tmp_result = db_query($link, "SELECT subscribers FROM
                                ttrss_feedbrowser_cache WHERE feed_url = '$feed_url'");
@@ -5904,8 +5905,8 @@
                        if (db_num_rows($tmp_result) == 0) {
 
                                db_query($link, "INSERT INTO ttrss_feedbrowser_cache
-                                       (feed_url, title, subscribers) VALUES ('$feed_url',
-                                               '$title', '$subscribers')");
+                                       (feed_url, site_url, title, subscribers) VALUES ('$feed_url',
+                                               '$site_url', '$title', '$subscribers')");
 
                                ++$count;