add ability to auto-assign articles to labels (bump schema)

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index fd98314a9c7a23291902191cfc77a09bd909dbe4..ed33b30c083b70889ef1f3395f87e37880f1a95c 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -59,6 +59,7 @@ class Feeds extends Handler_Protected {
                // right part\r
 \r
                $reply .= "<span class='r'>";\r
+               $reply .= "<span id='feed_title'>";\r
 \r
                if ($feed_site_url) {\r
                        $target = "target=\"_blank\"";\r
@@ -73,6 +74,8 @@ class Feeds extends Handler_Protected {
                        $reply .= $feed_title;\r
                }\r
 \r
+               $reply .= "</span>";\r
+\r
                $reply .= "\r
                        <a href=\"#\"\r
                                title=\"".__("View as RSS feed")."\"\r
@@ -152,12 +155,14 @@ class Feeds extends Handler_Protected {
                        // Update the feed if required with some basic flood control\r
 \r
                        $result = db_query($this->link,\r
-                               "SELECT ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated\r
+                               "SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated\r
                                        FROM ttrss_feeds WHERE id = '$feed'");\r
 \r
                                if (db_num_rows($result) != 0) {\r
                                        $last_updated = strtotime(db_fetch_result($result, 0, "last_updated"));\r
-                                       if (time() - $last_updated > 120) {\r
+                                       $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));\r
+\r
+                                       if (!$cache_images && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {\r
                                                include "rssfuncs.php";\r
                                                update_rss_feed($this->link, $feed, true, true);\r
                                        }\r
@@ -248,7 +253,7 @@ class Feeds extends Handler_Protected {
                if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
                        $button_plugins = array();\r
                        foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {\r
-                               $pclass = trim("button_${p}");\r
+                               $pclass = "button_" . trim($p);\r
 \r
                                if (class_exists($pclass)) {\r
                                        $plugin = new $pclass($link);\r