Revert "more prefer zot6"

This reverts commit e9a264cb43
This commit is contained in:
Mario
2020-08-24 11:26:52 +02:00
parent e9a264cb43
commit aafdeb9000

View File

@@ -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']))