From 27538f87e374a7f00a3b58fc5533819465f4c166 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 14 Feb 2014 21:04:08 +0000
Subject: [PATCH] make media links in rss feeds absolute
This resolves issues with broken images when the wiki feed is
hosted by third parties (e.g. FeedBurner), as mentioned in
FS#2931 comments.
---
feed.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/feed.php b/feed.php
index d9f52b5a2..34ce23c89 100644
--- a/feed.php
+++ b/feed.php
@@ -300,11 +300,11 @@ function rss_buildItems(&$rss, &$data, $opt) {
if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)), 300)) {
$more = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id));
- $src_r = ml($id, $more);
+ $src_r = ml($id, $more, true, '&', true);
}
if($rev && $size = media_image_preview_size($id, $rev, new JpegMeta(mediaFN($id, $rev)), 300)) {
$more = 'rev='.$rev.'&w='.$size[0].'&h='.$size[1];
- $src_l = ml($id, $more);
+ $src_l = ml($id, $more, true, '&', true);
}
$content = '';
if($src_r) {
@@ -348,7 +348,7 @@ function rss_buildItems(&$rss, &$data, $opt) {
if($ditem['media']) {
if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)))) {
$more = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id));
- $src = ml($id, $more);
+ $src = ml($id, $more, true, '&', true);
$content = '<img src="'.$src.'" alt="'.$id.'" />';
} else {
$content = '';
@@ -379,7 +379,7 @@ function rss_buildItems(&$rss, &$data, $opt) {
if($ditem['media']) {
if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)))) {
$more = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id));
- $src = ml($id, $more);
+ $src = ml($id, $more, true, '&', true);
$content = '<img src="'.$src.'" alt="'.$id.'" />';
} else {
$content = '';
--
GitLab