From e5992003e88545ffe5df0acc57c850733facdd5e Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 28 Oct 2011 02:50:00 -0700 Subject: better handling of remote urls - especially FB opengraph --- include/bb2diaspora.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/bb2diaspora.php') diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index efbf34758..aec2b74bc 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -22,7 +22,7 @@ function diaspora2bb($s) { } -function scale_diaspora_images($s) { +function scale_diaspora_images($s,$include_link = true) { $matches = null; $c = preg_match_all('/\[img\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER); @@ -38,7 +38,9 @@ function scale_diaspora_images($s) { $new_width = $ph->getWidth(); $new_height = $ph->getHeight(); $s = str_replace($mtch[0],'[img=' . $new_width . 'x' . $new_height. ']' . $mtch[1] . '[/img]' - . "\n" . '[url=' . $mtch[1] . ']' . t('view full size') . '[/url]' . "\n",$s); + . "\n" . ((! $include_link) + ? '[url=' . $mtch[1] . ']' . t('view full size') . '[/url]' . "\n" + : ''),$s); } } } -- cgit v1.2.3