diff options
| author | Mario Vavti <mario@mariovavti.com> | 2020-08-24 13:44:43 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2020-08-24 13:44:43 +0200 |
| commit | bd4867ef39fee496170167bb4046a4807aa2cdd9 (patch) | |
| tree | 4b73a7415792fc35587f485c07508e17358f2001 | |
| parent | 0189d06375320b3a6766f3b713a2e10533e97bb5 (diff) | |
| parent | aafdeb9000454e723a0b6a3940306f500245c4d0 (diff) | |
| download | volse-hubzilla-bd4867ef39fee496170167bb4046a4807aa2cdd9.tar.gz volse-hubzilla-bd4867ef39fee496170167bb4046a4807aa2cdd9.tar.bz2 volse-hubzilla-bd4867ef39fee496170167bb4046a4807aa2cdd9.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | include/security.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/security.php b/include/security.php index eb18f3b21..c9df00f1e 100644 --- a/include/security.php +++ b/include/security.php @@ -5,8 +5,6 @@ * @brief Some security related functions. */ -use Zotlabs\Lib\Libzot; - /** * @param int $user_record The account_id * @param array $channel @@ -279,16 +277,14 @@ function change_channel($change_channel) { } $ret = $r[0]; } - $x = q("select * from xchan where xchan_hash = '%s'", + $x = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($hash) ); if($x) { - $x = Libzot::zot_record_preferred($x, 'xchan_network'); - - $_SESSION['my_url'] = $x['xchan_url']; + $_SESSION['my_url'] = $x[0]['xchan_url']; $_SESSION['my_address'] = channel_reddress($r[0]); - App::set_observer($x); + App::set_observer($x[0]); App::set_perms(get_all_perms(local_channel(), $hash)); } if(! is_dir('store/' . $r[0]['channel_address'])) |