aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-29 18:38:24 -0700
committerredmatrix <git@macgirvin.com>2016-05-29 18:38:24 -0700
commit3b2679db29077c33912edb085a24906708ad97ee (patch)
tree1e4166ac246697000d2e81b93b84237688f0936c /include
parentac4688eac087854bf8cb0c893d7a79052ad63a20 (diff)
downloadvolse-hubzilla-3b2679db29077c33912edb085a24906708ad97ee.tar.gz
volse-hubzilla-3b2679db29077c33912edb085a24906708ad97ee.tar.bz2
volse-hubzilla-3b2679db29077c33912edb085a24906708ad97ee.zip
fix remote_channel(), update php minversion requirement
Diffstat (limited to 'include')
-rw-r--r--include/import.php2
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']) {