aboutsummaryrefslogtreecommitdiffstats
path: root/include/bb2diaspora.php
diff options
context:
space:
mode:
authortuscanhobbit <tuscanhobbit@users.noreply.github.com>2014-10-13 21:19:07 +0200
committertuscanhobbit <tuscanhobbit@users.noreply.github.com>2014-10-13 21:19:07 +0200
commit9dc3b01959211678aa392f173f4644971c91ba2d (patch)
tree8515cd7a3568011012d9b82e323d612bd48b414d /include/bb2diaspora.php
parent56f6f696bd5dd5b8120d562d9f43fe94d8e6dd41 (diff)
parent240cbc8798cf64ee6226db01dfd6e5b0bae8b85e (diff)
downloadvolse-hubzilla-9dc3b01959211678aa392f173f4644971c91ba2d.tar.gz
volse-hubzilla-9dc3b01959211678aa392f173f4644971c91ba2d.tar.bz2
volse-hubzilla-9dc3b01959211678aa392f173f4644971c91ba2d.zip
Merge from master
Diffstat (limited to 'include/bb2diaspora.php')
-rw-r--r--include/bb2diaspora.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index a80b3343b..76708143b 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -294,9 +294,9 @@ function bb2diaspora_itemwallwall(&$item) {
}
-function bb2diaspora_itembody($item) {
+function bb2diaspora_itembody($item,$force_update = false) {
- if($item['diaspora_meta']) {
+ if(($item['diaspora_meta']) && (! $force_update)) {
$diaspora_meta = json_decode($item['diaspora_meta'],true);
if($diaspora_meta) {
if(array_key_exists('iv',$diaspora_meta)) {