diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-05-30 10:08:13 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-05-30 10:08:13 +0200 |
| commit | 6d4adfcedccb041283949412b4adccf85d42a9f8 (patch) | |
| tree | 86f19e227325270f3a25707f16355c6985c18f20 /include | |
| parent | cac6cef4952e6535788c1c6db8ef1e58e88536a0 (diff) | |
| parent | f2ebe41a509d6e7f332fdc4cb43d14d555375bdf (diff) | |
| download | volse-hubzilla-6d4adfcedccb041283949412b4adccf85d42a9f8.tar.gz volse-hubzilla-6d4adfcedccb041283949412b4adccf85d42a9f8.tar.bz2 volse-hubzilla-6d4adfcedccb041283949412b4adccf85d42a9f8.zip | |
Merge branch 'dev' into sabre32
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']) { |