diff options
| author | friendica <info@friendica.com> | 2015-01-20 16:13:18 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-20 16:13:18 -0800 |
| commit | ee3eee425c92b37fba5a7035d8e9ec0b0b563d0b (patch) | |
| tree | d999bde3128a6a8c514388d318d3a2f68635aa41 /include/Contact.php | |
| parent | 6f11f20992c88ff48a55929e94d9003fcc437062 (diff) | |
| download | volse-hubzilla-ee3eee425c92b37fba5a7035d8e9ec0b0b563d0b.tar.gz volse-hubzilla-ee3eee425c92b37fba5a7035d8e9ec0b0b563d0b.tar.bz2 volse-hubzilla-ee3eee425c92b37fba5a7035d8e9ec0b0b563d0b.zip | |
that should take care of the bitfields in hubloc
Diffstat (limited to 'include/Contact.php')
| -rw-r--r-- | include/Contact.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/Contact.php b/include/Contact.php index 4a016e32f..c872dc913 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -22,9 +22,8 @@ function rconnect_url($channel_id,$xchan) { if(($r) && ($r[0]['xchan_follow'])) return $r[0]['xchan_follow']; - $r = q("select hubloc_url from hubloc where hubloc_hash = '%s' and ( hubloc_flags & %d )>0 limit 1", - dbesc($xchan), - intval(HUBLOC_FLAGS_PRIMARY) + $r = q("select hubloc_url from hubloc where hubloc_hash = '%s' and hubloc_primary = 1 limit 1", + dbesc($xchan) ); if($r) @@ -389,8 +388,7 @@ function mark_orphan_hubsxchans() { // } - $r = q("select hubloc_id, hubloc_hash from hubloc where hubloc_error = 0 and hubloc_orphancheck = 0", - ); + $r = q("select hubloc_id, hubloc_hash from hubloc where hubloc_error = 0 and hubloc_orphancheck = 0"); if($r) { foreach($r as $rr) { @@ -398,7 +396,7 @@ function mark_orphan_hubsxchans() { // see if any other hublocs are still alive for this channel $x = q("select * from hubloc where hubloc_hash = '%s' and hubloc_error = 0", - dbesc($rr['hubloc_hash']), + dbesc($rr['hubloc_hash']) ); if($x) { |