fix Opera caching bug

diff --git a/functions.php b/functions.php
index b6490fac9c24dcd0057b0f2a0e5f1cd01049cb5e..28b8a7db4e72b8f0438ad04849838b32c8137cba 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -355,6 +355,8 @@
 
                                $entry_comments = $item["comments"];
 
+                               $entry_author = db_escape_string($item['dc']['creator']);
+
                                $entry_guid = db_escape_string($entry_guid);
 
                                $result = db_query($link, "SELECT id FROM       ttrss_entries 
@@ -384,7 +386,8 @@
                                                        no_orig_date,
                                                        date_entered,
                                                        comments,
-                                                       num_comments)
+                                                       num_comments,
+                                                       author)
                                                VALUES
                                                        ('$entry_title', 
                                                        '$entry_guid', 
@@ -395,7 +398,8 @@
                                                        $no_orig_date, 
                                                        NOW(), 
                                                        '$entry_comments',
-                                                       '$num_comments')");
+                                                       '$num_comments',
+                                                       '$entry_author')");
                                } else {
                                        // we keep encountering the entry in feeds, so we need to
                                        // update date_entered column so that we don't get horrible

diff --git a/tt-rss.js b/tt-rss.js
index 2a7566a5f956fb58cedb0e0c3805a27a60a1afc3..3e5ad3a150cf37cf0c604bbfc1b8dcae685a8644 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -185,7 +185,7 @@ function scheduleFeedUpdate(force) {
 
        var omode;
 
-       if (firsttime_update) {
+       if (firsttime_update && !navigator.userAgent.match("Opera")) {
                firsttime_update = false;
                omode = "T";
        } else {