diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-28 16:02:51 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-28 16:02:51 -0700 |
| commit | bc74425872704ad955b37de18639ec831a245761 (patch) | |
| tree | a72a058190905f6f87488d51a97ce02df00f7422 /include/conversation.php | |
| parent | 35f17acb388f68745068d6a60e12c7b777b92282 (diff) | |
| download | volse-hubzilla-bc74425872704ad955b37de18639ec831a245761.tar.gz volse-hubzilla-bc74425872704ad955b37de18639ec831a245761.tar.bz2 volse-hubzilla-bc74425872704ad955b37de18639ec831a245761.zip | |
Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge"
This reverts commit 35f17acb388f68745068d6a60e12c7b777b92282, reversing
changes made to 58cf5f310d89026fb526e201c301075725044e48.
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 1efca37f3..957dbf8e9 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($item['obj'],true); + $obj = json_decode_plus($item['obj']); 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($item['obj'],true); + $obj= json_decode_plus($item['obj']); $Blink = $Bphoto = ''; @@ -219,7 +219,7 @@ function localize_item(&$item){ $Aname = $item['author']['xchan_name']; $Alink = $item['author']['xchan_url']; - $obj= json_decode($item['obj'],true); + $obj= json_decode_plus($item['obj']); $Blink = $Bphoto = ''; |