diff options
| author | zottel <github@zottel.net> | 2016-07-22 20:16:49 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2016-07-22 20:16:49 +0200 |
| commit | ed82cb108f99ce45ced841161fa505ecf11ceee4 (patch) | |
| tree | 03d75b325963a2ba5eba83045c1d1a042c4862f2 /include/conversation.php | |
| parent | 43def0873e6cc4cf535eb8282187757dd84283c2 (diff) | |
| parent | 4ffc4ee70aa38c24cee2a7ae0b35c9203515acef (diff) | |
| download | volse-hubzilla-ed82cb108f99ce45ced841161fa505ecf11ceee4.tar.gz volse-hubzilla-ed82cb108f99ce45ced841161fa505ecf11ceee4.tar.bz2 volse-hubzilla-ed82cb108f99ce45ced841161fa505ecf11ceee4.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index 957dbf8e9..1efca37f3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -99,7 +99,7 @@ function localize_item(&$item){ if(intval($item['item_thread_top'])) return; - $obj = json_decode_plus($item['obj']); + $obj = json_decode($item['obj'],true); if((! $obj) && ($item['obj'])) { logger('localize_item: failed to decode object: ' . print_r($item['obj'],true)); } @@ -186,7 +186,7 @@ function localize_item(&$item){ $Alink = $item['author']['xchan_url']; - $obj= json_decode_plus($item['obj']); + $obj= json_decode($item['obj'],true); $Blink = $Bphoto = ''; @@ -219,7 +219,7 @@ function localize_item(&$item){ $Aname = $item['author']['xchan_name']; $Alink = $item['author']['xchan_url']; - $obj= json_decode_plus($item['obj']); + $obj= json_decode($item['obj'],true); $Blink = $Bphoto = ''; |