diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-01-02 11:40:17 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-01-02 11:40:17 +0000 |
| commit | 577236c372b4eaa1e93d60d7bedaecea8ef8c97f (patch) | |
| tree | e9c38e309a8edcb72e25f17e751eeb6bac3feea0 /include/zot.php | |
| parent | 2fd0653d6ff3c60920946f83d249c8763dcad4a8 (diff) | |
| parent | 4108598133eae97e7c8a0b8e13ead4856f423cff (diff) | |
| download | volse-hubzilla-577236c372b4eaa1e93d60d7bedaecea8ef8c97f.tar.gz volse-hubzilla-577236c372b4eaa1e93d60d7bedaecea8ef8c97f.tar.bz2 volse-hubzilla-577236c372b4eaa1e93d60d7bedaecea8ef8c97f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php index ea2800672..46f0bd397 100644 --- a/include/zot.php +++ b/include/zot.php @@ -248,9 +248,11 @@ function zot_refresh($them,$channel = null) { else $permissions = $j['permissions']; - foreach($permissions as $k => $v) { - if($v) { - $their_perms = $their_perms | intval($global_perms[$k][1]); + if($permissions && is_array($permissions)) { + foreach($permissions as $k => $v) { + if($v) { + $their_perms = $their_perms | intval($global_perms[$k][1]); + } } } |