diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-29 21:45:54 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-29 21:45:54 -0400 |
| commit | 8f0c3f0e9be676e08b886af2d872cf9d544680bd (patch) | |
| tree | 4e7e532d8c9e35fa7db60d976c49392fae7e0685 /include | |
| parent | 4b350b909025ba2102d5ad2c5ee32b3c4eecaa48 (diff) | |
| parent | 3b2679db29077c33912edb085a24906708ad97ee (diff) | |
| download | volse-hubzilla-8f0c3f0e9be676e08b886af2d872cf9d544680bd.tar.gz volse-hubzilla-8f0c3f0e9be676e08b886af2d872cf9d544680bd.tar.bz2 volse-hubzilla-8f0c3f0e9be676e08b886af2d872cf9d544680bd.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include')
| -rw-r--r-- | include/import.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/import.php b/include/import.php index a94c6c1ac..132306621 100644 --- a/include/import.php +++ b/include/import.php @@ -20,6 +20,8 @@ function import_channel($channel, $account_id, $seize) { dbesc($channel['channel_hash']), dbesc($channel['channel_address']) ); + if($r && $r[0]['channel_guid'] == $channel['channel_guid'] && $r[0]['channel_pubkey'] === $channel['channel_pubkey'] && $r[0]['channel_hash'] === $channel['channel_hash']) + return $r[0]; 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']) { |