diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-07-08 14:38:00 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-07-08 14:38:00 +0200 |
| commit | 07e890a79a5c506b2e32272edf86ad4aba3b8fba (patch) | |
| tree | e4dc09eabadfd7eec0d9bb5d143ad8e20ba01113 | |
| parent | 3f9e39a9e3d72681056475fe60b193ef78caf536 (diff) | |
| parent | 7db1bd23f0056a5918f6f1657fdc3a968c18574e (diff) | |
| download | volse-hubzilla-07e890a79a5c506b2e32272edf86ad4aba3b8fba.tar.gz volse-hubzilla-07e890a79a5c506b2e32272edf86ad4aba3b8fba.tar.bz2 volse-hubzilla-07e890a79a5c506b2e32272edf86ad4aba3b8fba.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | include/zot.php | 2 | ||||
| -rw-r--r-- | mod/manage.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/zot.php b/include/zot.php index 31a12b763..4ac346002 100644 --- a/include/zot.php +++ b/include/zot.php @@ -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) ); diff --git a/mod/manage.php b/mod/manage.php index a7327697d..b609ede44 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -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']) ); |