merge zperms functionality into zfinger

2012-10-31 17:38:22 -07:00
parent eef329abe9
commit 2a0ff2b542
2 changed files with 30 additions and 22 deletions
--- a/include/zot.php
+++ b/include/zot.php
@@ -40,7 +40,7 @@ function zot_get_hubloc($arr,$primary = false) {

 	$sql_extra = (($primary) ? " and hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) : "" );
 	$limit = (($primary) ? " limit 1 " : "");
-	return q("select * from hubloc where hubloc_guid in ( $tmp ) $sql_extra order by hubloc_url $limit");
+	return q("select * from hubloc where hubloc_hash in ( $tmp ) $sql_extra order by hubloc_url $limit");

 }