diff options
| author | friendica <info@friendica.com> | 2013-08-06 03:54:49 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-08-06 03:54:49 -0700 |
| commit | 24b9799dcad3dc4a224ce2ceaf52645657106a60 (patch) | |
| tree | 0230360c1c7f4ec9d05f5846fb297dc3500d1470 /include/message.php | |
| parent | 71347bb9e0c5daca206b0ea32812874e165b7b63 (diff) | |
| download | volse-hubzilla-24b9799dcad3dc4a224ce2ceaf52645657106a60.tar.gz volse-hubzilla-24b9799dcad3dc4a224ce2ceaf52645657106a60.tar.bz2 volse-hubzilla-24b9799dcad3dc4a224ce2ceaf52645657106a60.zip | |
convert all stored json calls to json_decode_plus()
Diffstat (limited to 'include/message.php')
| -rw-r--r-- | include/message.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/message.php b/include/message.php index d6294cdba..fc0d5f2b3 100644 --- a/include/message.php +++ b/include/message.php @@ -181,9 +181,9 @@ function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) { $key = get_config('system','prvkey'); if($r[$k]['title']) - $r[$k]['title'] = aes_unencapsulate(json_decode($r[$k]['title'],true),$key); + $r[$k]['title'] = aes_unencapsulate(json_decode_plus($r[$k]['title']),$key); if($r[$k]['body']) - $r[$k]['body'] = aes_unencapsulate(json_decode($r[$k]['body'],true),$key); + $r[$k]['body'] = aes_unencapsulate(json_decode_plus($r[$k]['body']),$key); } } @@ -220,9 +220,9 @@ function private_messages_fetch_message($channel_id, $messageitem_id, $updatesee if($messages[$k]['mail_flags'] & MAIL_OBSCURED) { $key = get_config('system','prvkey'); if($messages[$k]['title']) - $messages[$k]['title'] = aes_unencapsulate(json_decode($messages[$k]['title'],true),$key); + $messages[$k]['title'] = aes_unencapsulate(json_decode_plus($messages[$k]['title']),$key); if($messages[$k]['body']) - $messages[$k]['body'] = aes_unencapsulate(json_decode($messages[$k]['body'],true),$key); + $messages[$k]['body'] = aes_unencapsulate(json_decode_plus($messages[$k]['body']),$key); } } @@ -308,9 +308,9 @@ function private_messages_fetch_conversation($channel_id, $messageitem_id, $upda if($messages[$k]['mail_flags'] & MAIL_OBSCURED) { $key = get_config('system','prvkey'); if($messages[$k]['title']) - $messages[$k]['title'] = aes_unencapsulate(json_decode($messages[$k]['title'],true),$key); + $messages[$k]['title'] = aes_unencapsulate(json_decode_plus($messages[$k]['title']),$key); if($messages[$k]['body']) - $messages[$k]['body'] = aes_unencapsulate(json_decode($messages[$k]['body'],true),$key); + $messages[$k]['body'] = aes_unencapsulate(json_decode_plus($messages[$k]['body']),$key); } } |