mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 23:55:19 +00:00
an issue related to #386
This commit is contained in:
parent
2dcedd6951
commit
883b1ff513
3 changed files with 6 additions and 1 deletions
|
@ -29,6 +29,7 @@ class Session {
|
|||
*/
|
||||
|
||||
$handler = new \Zotlabs\Web\SessionHandler();
|
||||
|
||||
$this->handler = $handler;
|
||||
|
||||
$x = session_set_save_handler($handler,false);
|
||||
|
|
|
@ -21,7 +21,7 @@ function import_channel($channel, $account_id, $seize) {
|
|||
dbesc($channel['channel_address'])
|
||||
);
|
||||
|
||||
if(($r) || (check_webbie(array($channel['channel_hash'])) !== $channel['channel_hash'])) {
|
||||
if(($r) || (check_webbie(array($channel['channel_address'])) !== $channel['channel_address'])) {
|
||||
if($r[0]['channel_guid'] === $channel['channel_guid'] || $r[0]['channel_hash'] === $channel['channel_hash']) {
|
||||
logger('mod_import: duplicate channel. ', print_r($channel,true));
|
||||
notice( t('Cannot create a duplicate channel identifier on this system. Import failed.') . EOL);
|
||||
|
|
|
@ -1168,6 +1168,10 @@ function discover_by_webbie($webbie) {
|
|||
if(! $x)
|
||||
$probe_old = true;
|
||||
|
||||
|
||||
if((! $dfrn) && (! $has_salmon))
|
||||
$probe_old = true;
|
||||
|
||||
if($probe_old) {
|
||||
$y = old_webfinger($webbie);
|
||||
if($y) {
|
||||
|
|
Loading…
Reference in a new issue