harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

an issue related to #386

Browse Source
This commit is contained in:
redmatrix 2016-05-16 19:23:42 -07:00
parent 2dcedd6951
commit 883b1ff513
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Web/Session.php
View File

@ -29,6 +29,7 @@ class Session {
*/ */
$handler = new \Zotlabs\Web\SessionHandler(); $handler = new \Zotlabs\Web\SessionHandler();
$this->handler = $handler; $this->handler = $handler;
$x = session_set_save_handler($handler,false); $x = session_set_save_handler($handler,false);

2
include/import.php
View File

@ -21,7 +21,7 @@ function import_channel($channel, $account_id, $seize) {
dbesc($channel['channel_address']) 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']) { if($r[0]['channel_guid'] === $channel['channel_guid'] || $r[0]['channel_hash'] === $channel['channel_hash']) {
logger('mod_import: duplicate channel. ', print_r($channel,true)); logger('mod_import: duplicate channel. ', print_r($channel,true));
notice( t('Cannot create a duplicate channel identifier on this system. Import failed.') . EOL); notice( t('Cannot create a duplicate channel identifier on this system. Import failed.') . EOL);

4
include/network.php
View File

@ -1168,6 +1168,10 @@ function discover_by_webbie($webbie) {
if(! $x) if(! $x)
$probe_old = true; $probe_old = true;
if((! $dfrn) && (! $has_salmon))
$probe_old = true;
if($probe_old) { if($probe_old) {
$y = old_webfinger($webbie); $y = old_webfinger($webbie);
if($y) { if($y) {