mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-22 01:35:26 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
07e890a79a
2 changed files with 2 additions and 2 deletions
|
@ -80,7 +80,7 @@ function zot_get_hublocs($hash) {
|
|||
|
||||
/* Only search for active hublocs - e.g. those that haven't been marked deleted */
|
||||
|
||||
$ret = q("select * from hubloc where hubloc_hash = '%s' and hubloc_deleted != 0 order by hubloc_url ",
|
||||
$ret = q("select * from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0 order by hubloc_url ",
|
||||
dbesc($hash)
|
||||
);
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@ function manage_content(&$a) {
|
|||
}
|
||||
|
||||
|
||||
$intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 0 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ",
|
||||
$intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ",
|
||||
intval($channels[$x]['channel_id'])
|
||||
);
|
||||
|
||||
|
|
Loading…
Reference in a new issue