Merge branch 'master' of git.tt-rss.org:fox/tt-rss

1 files changed, 2 insertions, 2 deletions

diff --git a/classes/article.php b/classes/article.php
index 43b25f94f..62ea1f3b9 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -446,7 +446,7 @@ class Article extends Handler_Protected {
 			foreach ($result as $line) {
 
 				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ENCLOSURE_ENTRY) as $plugin) {
-					$line = $plugin->hook_enclosure_entry($line);
+					$line = $plugin->hook_enclosure_entry($line, $id);
 				}
 
 				$url = $line["content_url"];
@@ -676,7 +676,7 @@ class Article extends Handler_Protected {
 		while ($line = $sth->fetch()) {
 
 			if (file_exists(CACHE_DIR . '/images/' . sha1($line["content_url"]))) {
-				$line["content_url"] = get_self_url_prefix() . '/public.php?op=cached_url&hash=' . sha1($line["content_url"]);
+				$line["content_url"] = DiskCache::getUrl(sha1($line["content_url"]));
 			}
 
 			array_push($rv, $line);