mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 02:55:13 +00:00
Merge branch 'dev' of ../p3 into dev
This commit is contained in:
commit
58a1fb50e8
1 changed files with 3 additions and 3 deletions
|
@ -15,9 +15,6 @@ class Fedi_id extends Controller {
|
||||||
if ($_REQUEST['address']) {
|
if ($_REQUEST['address']) {
|
||||||
$x = discover_by_webbie(trim($_REQUEST['address']));
|
$x = discover_by_webbie(trim($_REQUEST['address']));
|
||||||
if ($x) {
|
if ($x) {
|
||||||
$r = q("select * from xchan where xchan_hash = '%s'",
|
|
||||||
dbesc($x)
|
|
||||||
);
|
|
||||||
$ab = q("select * from abook where abook_xchan = '%s' and abook_channel = %d",
|
$ab = q("select * from abook where abook_xchan = '%s' and abook_channel = %d",
|
||||||
dbesc($x),
|
dbesc($x),
|
||||||
intval($channel['channel_id'])
|
intval($channel['channel_id'])
|
||||||
|
@ -26,6 +23,9 @@ class Fedi_id extends Controller {
|
||||||
notice( t('You are already connected with this channel.') );
|
notice( t('You are already connected with this channel.') );
|
||||||
goaway(channel_url($channel));
|
goaway(channel_url($channel));
|
||||||
}
|
}
|
||||||
|
$r = q("select * from xchan where xchan_hash = '%s'",
|
||||||
|
dbesc($x)
|
||||||
|
);
|
||||||
if ($r && $r[0]['xchan_follow']) {
|
if ($r && $r[0]['xchan_follow']) {
|
||||||
goaway(sprintf($r[0]['xchan_follow'],urlencode(channel_reddress($channel))));
|
goaway(sprintf($r[0]['xchan_follow'],urlencode(channel_reddress($channel))));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue