diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-13 03:22:01 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-13 03:22:01 -0700 |
| commit | 0c5408e22b47880e8e657d4e10f8b39581f2a29a (patch) | |
| tree | 9360fbbeca2599b0f4f94b1b48f38f3bedbcc3d3 /include/bb2diaspora.php | |
| parent | bde8c6d39e1ccf7a53569cc652a62b5447d3243f (diff) | |
| parent | a512d1a4aab35ac874ccbff89d84fdd6d5b3343f (diff) | |
| download | volse-hubzilla-0c5408e22b47880e8e657d4e10f8b39581f2a29a.tar.gz volse-hubzilla-0c5408e22b47880e8e657d4e10f8b39581f2a29a.tar.bz2 volse-hubzilla-0c5408e22b47880e8e657d4e10f8b39581f2a29a.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/bb2diaspora.php')
| -rw-r--r-- | include/bb2diaspora.php | 4 |
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)) { |