wip for flavor imagesexp-headline-flavor-images

2 files changed, 38 insertions, 15 deletions

diff --git a/classes/article.php b/classes/article.php
index 04855ac9d..b197d71b8 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -292,9 +292,12 @@ class Article extends Handler_Protected {
 	static function _format_enclosures($id,
 										$always_display_enclosures,
 									   $article_content,
-										$hide_images = false) {
+										$hide_images = false,
+										$enclosures = false) {
+
+		if ($enclosures === false)
+			$enclosures = self::_get_enclosures($id);
 
-		$enclosures = self::_get_enclosures($id);
 		$enclosures_formatted = "";
 
 		/*foreach ($enclosures as &$enc) {
diff --git a/classes/feeds.php b/classes/feeds.php
index 68d535481..f2cfa5b7f 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -244,6 +244,38 @@ class Feeds extends Handler_Protected {
 					},
 					$line);
 
+				$this->_mark_timestamp("   pre-enclosures");
+
+				if ($line["num_enclosures"] > 0) {
+					$enclosures = Article::_get_enclosures($id);
+
+					$line["enclosures"] = Article::_format_enclosures($id,
+													$line["always_display_enclosures"],
+													$line["content"],
+													$line["hide_images"],
+													$enclosures);
+
+				} else {
+					$enclosures = [];
+					$line["enclosures"] = [ 'formatted' => '', 'entries' => [] ];
+				}
+
+				$this->_mark_timestamp("   enclosures");
+
+				list ($flavor_image, $flavor_stream, $flavor_kind) = Article::_get_image($enclosures,
+									$line["content"], // unsanitized
+									$line["site_url"],
+									$line);
+
+				$line["flavor_image"] = $flavor_image;
+				$line["flavor_stream"] = $flavor_stream;
+
+				/* optional */
+				if ($flavor_kind)
+					$line["flavor_kind"] = $flavor_kind;
+
+				$this->_mark_timestamp("   flavor image");
+
 				$this->_mark_timestamp("   pre-sanitize");
 
 				$line["content"] = Sanitizer::sanitize($line["content"],
@@ -261,19 +293,6 @@ class Feeds extends Handler_Protected {
 					}
 				}
 
-				$this->_mark_timestamp("   pre-enclosures");
-
-				if ($line["num_enclosures"] > 0) {
-					$line["enclosures"] = Article::_format_enclosures($id,
-						$line["always_display_enclosures"],
-						$line["content"],
-						$line["hide_images"]);
-				} else {
-					$line["enclosures"] = [ 'formatted' => '', 'entries' => [] ];
-				}
-
-				$this->_mark_timestamp("   enclosures");
-
 				$line["updated_long"] = TimeHelper::make_local_datetime($line["updated"],true);
 				$line["updated"] = TimeHelper::make_local_datetime($line["updated"], false, false, false, true);
 
@@ -315,6 +334,7 @@ class Feeds extends Handler_Protected {
 				}
 
 				$this->_mark_timestamp("   color");
+
 				$this->_mark_timestamp("   pre-hook_render_cdm");
 
 				PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_RENDER_ARTICLE_CDM,