aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-04-29 11:10:54 +0000
committerMario <mario@mariovavti.com>2020-04-29 11:10:54 +0000
commit837dbb7a1414d9e14d588f1e425acd12a2dc87e3 (patch)
tree08ae376c9a30a338a554be9d2dd2954a95476c20 /Zotlabs
parentc9794439bcdf7bf738055fdecddc754609b8b9ab (diff)
downloadvolse-hubzilla-837dbb7a1414d9e14d588f1e425acd12a2dc87e3.tar.gz
volse-hubzilla-837dbb7a1414d9e14d588f1e425acd12a2dc87e3.tar.bz2
volse-hubzilla-837dbb7a1414d9e14d588f1e425acd12a2dc87e3.zip
Ãfix photo items
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Activity.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 9b79190bb..5c72a1175 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -178,7 +178,6 @@ class Activity {
static function fetch_image($x) {
-
$ret = [
'type' => 'Image',
'id' => $x['id'],
@@ -2242,9 +2241,7 @@ class Activity {
}
- // avoid double images from hubzilla to zap/osada
-
- if($act->obj['type'] === 'Image' && strpos($s['body'],'zrl=') === false) {
+ if($act->obj['type'] === 'Image') {
$ptr = null;
@@ -2258,10 +2255,11 @@ class Activity {
}
foreach($ptr as $vurl) {
if(strpos($s['body'],$vurl['href']) === false) {
- $s['body'] .= '[zmg]' . $vurl['href'] . '[/zmg]' . "\n\n" . $s['body'];
+ $bb_imgs .= '[zmg]' . $vurl['href'] . '[/zmg]' . "\n\n";
break;
}
}
+ $s['body'] = $bb_imgs . $s['body'];
}
elseif(is_string($act->obj['url'])) {
if(strpos($s['body'],$act->obj['url']) === false) {