harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

silence warning about non array diaspora_meta but report it in the logs so we can find out what it actually is and why.

Browse Source
This commit is contained in:
redmatrix 2015-07-19 21:18:13 -07:00
parent 15b6e8faa4
commit 24ec104819
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@ -1282,10 +1282,12 @@ function encode_item($item,$mirror = false) {
if($item['diaspora_meta']) { if($item['diaspora_meta']) {
$z = json_decode($item['diaspora_meta'],true); $z = json_decode($item['diaspora_meta'],true);
if($z) { if($z) {
if(array_key_exists('iv',$z)) if(is_array($z) && array_key_exists('iv',$z))
$x['diaspora_signature'] = crypto_unencapsulate($z,$key); $x['diaspora_signature'] = crypto_unencapsulate($z,$key);
else else
$x['diaspora_signature'] = $z; $x['diaspora_signature'] = $z;
if(! is_array($z))
logger('encode_item: diaspora meta is not an array: ' . print_r($z,true));
} }
} }
logger('encode_item: ' . print_r($x,true), LOGGER_DATA); logger('encode_item: ' . print_r($x,true), LOGGER_DATA);