aboutsummaryrefslogtreecommitdiffstats
path: root/include/bb2diaspora.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-10-28 02:50:00 -0700
committerFriendika <info@friendika.com>2011-10-28 02:50:00 -0700
commite5992003e88545ffe5df0acc57c850733facdd5e (patch)
treee873335a8e05870e01f5cc8d637611c4ade7c66e /include/bb2diaspora.php
parente5a7b3e24b5eccf31be7ef5b78580b599a94952f (diff)
downloadvolse-hubzilla-e5992003e88545ffe5df0acc57c850733facdd5e.tar.gz
volse-hubzilla-e5992003e88545ffe5df0acc57c850733facdd5e.tar.bz2
volse-hubzilla-e5992003e88545ffe5df0acc57c850733facdd5e.zip
better handling of remote urls - especially FB opengraph
Diffstat (limited to 'include/bb2diaspora.php')
-rw-r--r--include/bb2diaspora.php6
1 files changed, 4 insertions, 2 deletions
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);
}
}
}