diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-25 07:33:18 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-25 07:33:18 +0100 |
| commit | e4674142c6a205651d4bb207aa038e6d089da73f (patch) | |
| tree | 81b433f9d6bb00691b3e8e48e39c09b5e0f7b755 /mod/magic.php | |
| parent | 089509ab876708ecebeec866e5957d979dd5bffa (diff) | |
| parent | 9081ddb455993cef96e121cebb2f569ae63a50f3 (diff) | |
| download | volse-hubzilla-e4674142c6a205651d4bb207aa038e6d089da73f.tar.gz volse-hubzilla-e4674142c6a205651d4bb207aa038e6d089da73f.tar.bz2 volse-hubzilla-e4674142c6a205651d4bb207aa038e6d089da73f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/magic.php')
| -rw-r--r-- | mod/magic.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mod/magic.php b/mod/magic.php index 2fee87241..12679773b 100644 --- a/mod/magic.php +++ b/mod/magic.php @@ -105,6 +105,7 @@ function magic_init(&$a) { $r = q("select * from channel left join hubloc on channel_hash = hubloc_hash where hubloc_addr = '%s' limit 1", dbesc($delegate) ); + if($r && intval($r[0]['channel_id'])) { $allowed = perm_is_allowed($r[0]['channel_id'],get_observer_hash(),'delegate'); if($allowed) { @@ -112,6 +113,7 @@ function magic_init(&$a) { $_SESSION['delegate'] = get_observer_hash(); $_SESSION['account_id'] = intval($r[0]['channel_account_id']); change_channel($r[0]['channel_id']); + $delegation_success = true; } } |