diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-01-03 09:57:46 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-01-03 09:57:46 +0000 |
| commit | 60e2d7b0264d49bd3d4fb2c49b02c0edfee4246b (patch) | |
| tree | 33325692994b7f7a12d9669cb51797c8618ed590 | |
| parent | 958b5d623ecc89fb2dde4155f56358860e855f32 (diff) | |
| parent | 4aae0ac948ed96f53c96bab9106f653fd3efb011 (diff) | |
| download | volse-hubzilla-60e2d7b0264d49bd3d4fb2c49b02c0edfee4246b.tar.gz volse-hubzilla-60e2d7b0264d49bd3d4fb2c49b02c0edfee4246b.tar.bz2 volse-hubzilla-60e2d7b0264d49bd3d4fb2c49b02c0edfee4246b.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | include/zot.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/zot.php b/include/zot.php index 5771b67d1..a8a8044b2 100644 --- a/include/zot.php +++ b/include/zot.php @@ -180,7 +180,8 @@ function zot_finger($webbie,$channel) { function zot_refresh($them,$channel = null) { logger('zot_refresh: them: ' . print_r($them,true), LOGGER_DATA); - logger('zot_refresh: channel: ' . print_r($channel,true), LOGGER_DATA); + if($channel) + logger('zot_refresh: channel: ' . print_r($channel,true), LOGGER_DATA); if($them['hubloc_url']) $url = $them['hubloc_url']; @@ -283,7 +284,7 @@ function zot_refresh($them,$channel = null) { if($z) $default_perms = intval($z[0]['my_perms']); - $y = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_their_perms, abook_my_perms, abook_created, abook_updated, abook_flags ) values ( %d, %d, '%s', %d, '%s', '%s', %d )", + $y = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_their_perms, abook_my_perms, abook_created, abook_updated, abook_flags ) values ( %d, %d, '%s', %d, %d, '%s', '%s', %d )", intval($channel['channel_account_id']), intval($channel['channel_id']), dbesc($x['hash']), |