Fixes a bug where noncanonical urls were being used for json feeds, a=chris
Fixes a bug where noncanonical urls were being used for json feeds, a=chris
diff --git a/src/library/media_jobs/NewsUpdateJob.php b/src/library/media_jobs/NewsUpdateJob.php
index 7c2d0c9dd..b86c67e16 100644
--- a/src/library/media_jobs/NewsUpdateJob.php
+++ b/src/library/media_jobs/NewsUpdateJob.php
@@ -406,6 +406,10 @@ class NewsUpdateJob extends MediaJob
$element_text = UrlParser::canonicalLink($element_text,
$feed["SOURCE_URL"]);
}
+ if ($db_element == "link" && $tag_node && $is_json) {
+ $element_text = UrlParser::canonicalLink($element_text,
+ $feed["SOURCE_URL"]);
+ }
$item[$db_element] = strip_tags($element_text);
}
$item['image_link'] = "";
diff --git a/src/views/elements/SearchsourcesElement.php b/src/views/elements/SearchsourcesElement.php
index 259e10486..bf1af77d9 100644
--- a/src/views/elements/SearchsourcesElement.php
+++ b/src/views/elements/SearchsourcesElement.php
@@ -204,7 +204,7 @@ class SearchsourcesElement extends Element
urlencode($source['NAME']));
?>
<tr><td><?php
- if (in_array($source['TYPE'], ["rss", "html"])) {
+ if (in_array($source['TYPE'], ["rss", "html",'json'])) {
?><a href="<?=B\subsearchUrl('news', true) . $token_string
?>&q=media:news:<?=$encode_source
?>"><?=$source['NAME'] ?></a>