aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-08-21 21:38:10 -0700
committerzotlabs <mike@macgirvin.com>2018-08-21 21:38:10 -0700
commit42c4a0da51c61497427721a7467d1d6c8a09a605 (patch)
tree06f3fc14746acc1e8c61d4db8d6961e9ceca54a1
parent8bf1e3a9449b95307d6d991284dce1addade813a (diff)
downloadvolse-hubzilla-42c4a0da51c61497427721a7467d1d6c8a09a605.tar.gz
volse-hubzilla-42c4a0da51c61497427721a7467d1d6c8a09a605.tar.bz2
volse-hubzilla-42c4a0da51c61497427721a7467d1d6c8a09a605.zip
Zot/Finger: ignore deleted hublocs
-rw-r--r--Zotlabs/Zot/Finger.php2
-rw-r--r--include/security.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php
index 348171bdc..559f9657a 100644
--- a/Zotlabs/Zot/Finger.php
+++ b/Zotlabs/Zot/Finger.php
@@ -55,7 +55,7 @@ class Finger {
$r = q("select xchan.*, hubloc.* from xchan
left join hubloc on xchan_hash = hubloc_hash
- where xchan_addr = '%s' and hubloc_primary = 1 limit 1",
+ where xchan_addr = '%s' and hubloc_primary = 1 and hubloc_deleted = 0 limit 1",
dbesc($xchan_addr)
);
diff --git a/include/security.php b/include/security.php
index 88988a7c0..ffdd1d7ea 100644
--- a/include/security.php
+++ b/include/security.php
@@ -370,7 +370,7 @@ function permissions_sql($owner_id, $remote_observer = null, $table = '') {
}
/**
- * @brief Creates an addiontal SQL where statement to check permissions for an item.
+ * @brief Creates an additional SQL where statement to check permissions for an item.
*
* @param int $owner_id
* @param bool $remote_observer (optional) use current observer if unset