aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-07-14 20:42:06 -0700
committerfriendica <info@friendica.com>2013-07-14 20:42:06 -0700
commit9e28318e4d9802ee6d901c9144427f11d08d4898 (patch)
tree39855583ce686fe12013c2a8323c93badc3104b3 /include
parent12c2cea36f09049b5f1de42be3ee761e7760dc35 (diff)
downloadvolse-hubzilla-9e28318e4d9802ee6d901c9144427f11d08d4898.tar.gz
volse-hubzilla-9e28318e4d9802ee6d901c9144427f11d08d4898.tar.bz2
volse-hubzilla-9e28318e4d9802ee6d901c9144427f11d08d4898.zip
more error checking
Diffstat (limited to 'include')
-rw-r--r--include/zot.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php
index 520a7383d..f7c9bea4c 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -404,7 +404,7 @@ function zot_gethub($arr) {
return $r[0];
}
}
- logger('zot_gethub: not found', LOGGER_DEBUG);
+ logger('zot_gethub: not found: ' . print_r($arr,true), LOGGER_DEBUG);
return null;
}
@@ -588,9 +588,13 @@ function import_xchan($arr) {
}
}
- $r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' limit 1",
+ $r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s'
+ and hubloc_url = '%s' and hubloc_url_sig = '%s' limit 1",
dbesc($xchan_hash),
- dbesc($location['url'])
+ dbesc($arr['guid']),
+ dbesc($arr['guid_sig']),
+ dbesc($location['url']),
+ dbesc($location['url_sig'])
);
if($r) {
logger('import_xchan: hub exists: ' . $location['url']);