aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-08-11 16:12:40 -0700
committerfriendica <info@friendica.com>2013-08-11 16:16:05 -0700
commit5aa508dba77ed69e1aa8810623e75d15ad15c2ad (patch)
tree9fd97fdb05fbb7bfea1b038ae1b0dae99f44a229
parentd8d45dab76fa96df9f57e9d5975daaf5a5322026 (diff)
downloadvolse-hubzilla-5aa508dba77ed69e1aa8810623e75d15ad15c2ad.tar.gz
volse-hubzilla-5aa508dba77ed69e1aa8810623e75d15ad15c2ad.tar.bz2
volse-hubzilla-5aa508dba77ed69e1aa8810623e75d15ad15c2ad.zip
don't import any hubloc that doesn't have a sitekey. Eventually we should also verify that it is a valid key, as we've already seen one case where one character got mangled and messed up communication.
-rw-r--r--include/zot.php9
-rw-r--r--version.inc2
2 files changed, 8 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php
index d1bc03bc2..bddbc9bee 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -583,9 +583,14 @@ function import_xchan($arr) {
intval(HUBLOC_FLAGS_PRIMARY),
intval($r[0]['hubloc_id'])
);
+ update_modtime($xchan_hash);
+ $changed = true;
}
- update_modtime($xchan_hash);
- $changed = true;
+ continue;
+ }
+
+ if(! $location['sitekey']) {
+ logger('import_xchan: empty hubloc sitekey. ' . print_r($location,true));
continue;
}
diff --git a/version.inc b/version.inc
index 82ebb3399..208912a37 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-08-09.400
+2013-08-11.402