diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-16 19:23:42 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-16 19:23:42 -0700 |
| commit | 883b1ff51355b72a1af2a1ab09877bc444ee905f (patch) | |
| tree | 8468e7a255f131c23b696a4438ac54691666ef1e | |
| parent | 2dcedd69519a40ca0f40bf7b8b86423e98c778c9 (diff) | |
| download | volse-hubzilla-883b1ff51355b72a1af2a1ab09877bc444ee905f.tar.gz volse-hubzilla-883b1ff51355b72a1af2a1ab09877bc444ee905f.tar.bz2 volse-hubzilla-883b1ff51355b72a1af2a1ab09877bc444ee905f.zip | |
an issue related to #386
| -rw-r--r-- | Zotlabs/Web/Session.php | 1 | ||||
| -rw-r--r-- | include/import.php | 2 | ||||
| -rw-r--r-- | include/network.php | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Web/Session.php b/Zotlabs/Web/Session.php index df7249a34..b1f5526ea 100644 --- a/Zotlabs/Web/Session.php +++ b/Zotlabs/Web/Session.php @@ -29,6 +29,7 @@ class Session { */ $handler = new \Zotlabs\Web\SessionHandler(); + $this->handler = $handler; $x = session_set_save_handler($handler,false); diff --git a/include/import.php b/include/import.php index 46c8057b6..00058047e 100644 --- a/include/import.php +++ b/include/import.php @@ -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); diff --git a/include/network.php b/include/network.php index 9f68d3df3..f80244f8f 100644 --- a/include/network.php +++ b/include/network.php @@ -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) { |