Merge remote-tracking branch 'upstream/master'

1 files changed, 4 insertions, 2 deletions

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index a95280a31..df1d16986 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -573,15 +573,17 @@
 				$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");
 				}
 
 				if ($cache_images && is_writable(CACHE_DIR . '/images'))
-					$entry_content = cache_images($entry_content, $site_url, $debug_enabled);
+					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);