aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-12 02:26:56 -0700
committerfriendica <info@friendica.com>2013-09-12 02:26:56 -0700
commitca1b8dbe1e5619a7720f0a1587ffad21f544980a (patch)
tree88914d31b357b6919879a31fac6875c31659a76e /include
parentd593b40d9a31d00ec4374c60d509812996ff32d9 (diff)
parent2c06a2c16321e8ae80ba04b920b20d378be6325d (diff)
downloadvolse-hubzilla-ca1b8dbe1e5619a7720f0a1587ffad21f544980a.tar.gz
volse-hubzilla-ca1b8dbe1e5619a7720f0a1587ffad21f544980a.tar.bz2
volse-hubzilla-ca1b8dbe1e5619a7720f0a1587ffad21f544980a.zip
Merge pull request #129 from MicMee/master
to flag failed auth attempts in db table hubloc as hubloc_receive_error
Diffstat (limited to 'include')
-rw-r--r--include/zot.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 9e8dd3dfa..cdbfd2185 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -903,8 +903,9 @@ function zot_import($arr) {
$result = process_channel_sync_delivery($i['notify']['sender'],$arr,$deliveries);
}
}
- if($result)
+ if($result){
$return = array_merge($return,$result);
+ }
}
}