split transparent rewriting of locally cached media URLs to execute after both sanitize() and HOOK_RENDER_ARTICLE to allow plugins work on original source URLs consistently

3 files changed, 8 insertions, 0 deletions

diff --git a/classes/api.php b/classes/api.php
index 4c321d77e..5dbf8dc1f 100644..100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -379,6 +379,8 @@ class API extends Handler {
 					$article = $p->hook_render_article_api(array("article" => $article));
 				}
 
+				$article['content'] = rewrite_cached_urls($article['content']);
+
 				array_push($articles, $article);
 
 			}
@@ -799,6 +801,8 @@ class API extends Handler {
 						$headline_row = $p->hook_render_article_api(array("headline" => $headline_row));
 					}
 
+					$headline_row['content'] = rewrite_cached_urls($headline_row['content']);
+
 					array_push($headlines, $headline_row);
 				}
 			} else if (is_numeric($result) && $result == -1) {
diff --git a/classes/article.php b/classes/article.php
index c8ee5b931..71dfdabc4 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -610,6 +610,8 @@ class Article extends Handler_Protected {
 				$line = $p->hook_render_article($line);
 			}
 
+			$line['content'] = rewrite_cached_urls($line['content']);
+
 			$num_comments = (int) $line["num_comments"];
 			$entry_comments = "";
 
diff --git a/classes/feeds.php b/classes/feeds.php
index 47a6b56b8..6bf14f45e 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -477,6 +477,8 @@ class Feeds extends Handler_Protected {
 						$line = $p->hook_render_article_cdm($line);
 					}
 
+					$line['content'] = rewrite_cached_urls($line['content']);
+
 					if ($vfeed_group_enabled && $line["feed_title"]) {
 						if ($feed_id != $vgroup_last_feed) {