diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-01-21 10:42:41 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-01-21 10:42:41 +0100 |
| commit | 2b3b6268ddd73d4a438cc6c9431ab3577b218fd1 (patch) | |
| tree | 3b2f0606d912a5c9fb846d804e04fcb20eaa3de6 /include | |
| parent | 97ebf9021c5297a7ab2e3685bf920458d4bd3181 (diff) | |
| parent | 1d891984441fa2f4aa8e311191da23e9ddd6e928 (diff) | |
| download | volse-hubzilla-2b3b6268ddd73d4a438cc6c9431ab3577b218fd1.tar.gz volse-hubzilla-2b3b6268ddd73d4a438cc6c9431ab3577b218fd1.tar.bz2 volse-hubzilla-2b3b6268ddd73d4a438cc6c9431ab3577b218fd1.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'include')
| -rw-r--r-- | include/Contact.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/Contact.php b/include/Contact.php index 3bd5f9936..611371db6 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -331,6 +331,7 @@ function channel_remove($channel_id, $local = true, $unset_session=true) { dbesc(datetime_convert()), intval($channel_id) ); + // if this was the default channel, set another one as default if($a->account['account_default_channel'] == $channel_id) { $r = q("select channel_id from channel where channel_account_id = %d and channel_removed = 0 limit 1", @@ -344,12 +345,11 @@ function channel_remove($channel_id, $local = true, $unset_session=true) { } else { $rr = q("update account set account_default_channel = 0 where account_id = %d", - intval($r[0]['channel_id']), - intval($a->account['account_id'])); + intval($a->account['account_id']) + ); } } - logger('deleting hublocs',LOGGER_DEBUG); $r = q("update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s' and hubloc_url = '%s' ", |