properly fix the cache_images issue (refs #578)

[tt-rss.git] / include / rssfuncs.php

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 5c49008c56db1cfbfdb33d9c5dbde49541d8566d..1180b0adb662b75de08cf9f55e0796b531f86a83 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -573,6 +573,8 @@
                                $entry_author = db_escape_string($article["author"]);
                                $entry_link = db_escape_string($article["link"]);
                                $entry_plugin_data = db_escape_string($article["plugin_data"]);
+                               $entry_content = $article["content"]; // escaped below
+
 
                                if ($debug_enabled) {
                                        _debug("update_rss_feed: plugin data: $entry_plugin_data");
@@ -581,7 +583,7 @@
                                if ($cache_images && is_writable(CACHE_DIR . '/images'))
                                        $entry_content = cache_images($entry_content, $site_url, $debug_enabled);
 
-                               $entry_content = db_escape_string($article["content"], false);
+                               $entry_content = db_escape_string($entry_content, false);
 
                                $content_hash = "SHA1:" . sha1($entry_content);
 
@@ -766,12 +768,17 @@
                                                        }
                                                }
 
+                                               $last_marked = ($marked == 'true') ? 'NOW()' : 'NULL';
+                                               $last_published = ($published == 'true') ? 'NOW()' : 'NULL';
+
                                                $result = db_query($link,
                                                        "INSERT INTO ttrss_user_entries
                                                                (ref_id, owner_uid, feed_id, unread, last_read, marked,
-                                                                       published, score, tag_cache, label_cache, uuid)
+                                                               published, score, tag_cache, label_cache, uuid,
+                                                               last_marked, last_published)
                                                        VALUES ('$ref_id', '$owner_uid', '$feed', $unread,
-                                                               $last_read_qpart, $marked, $published, '$score', '', '', '')");
+                                                               $last_read_qpart, $marked, $published, '$score', '', '',
+                                                               '', $last_marked, $last_published)");
 
                                                if (PUBSUBHUBBUB_HUB && $published == 'true') {
                                                        $rss_link = get_self_url_prefix() .