allow manual updates for feeds with disabled automatic updates

diff --git a/classes/rpc.php b/classes/rpc.php
index a5e32d47e594d43623823de674b91b2cfef61cd9..5bb9b32953c1b5099748b5991287323c1f958726 100644 (file)
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -746,7 +746,7 @@ class RPC extends Protected_Handler {
 
                                db_query($this->link, "UPDATE ttrss_feeds SET
                                        last_update_started = '1970-01-01',
-                                       last_updated = '1970-01-01' WHERE id = '$feed_id' AND
+                                       last_updated = NULL WHERE id = '$feed_id' AND
                                        owner_uid = ".$_SESSION["uid"]);
 
                        } else {
@@ -759,7 +759,7 @@ class RPC extends Protected_Handler {
 
                                db_query($this->link, "UPDATE ttrss_feeds SET
                                                last_update_started = '1970-01-01',
-                                               last_updated = '1970-01-01' WHERE $cat_query AND
+                                               last_updated = NULL WHERE $cat_query AND
                                                owner_uid = ".$_SESSION["uid"]);
                        }
                } else {

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 6d3cfc3bf5ff23b3673ca0a680c5d61efbce36e2..1baa31d15985040c77469455cfd589ab8679bbb2 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -310,12 +310,9 @@
                        $auth_pass = urlencode($auth_pass);
                }
 
-               $update_interval = db_fetch_result($result, 0, "update_interval");
                $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
                $fetch_url = db_fetch_result($result, 0, "feed_url");
 
-               if ($update_interval < 0) { return false; }
-
                $feed = db_escape_string($feed);
 
                if ($auth_login && $auth_pass ){