diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 13:14:34 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 13:14:34 -0700 |
| commit | 51db7536380d70e2047aa91c3a12809cc3444aa8 (patch) | |
| tree | 359c67869e57a5c42aed637f63c2dd7953bddbb7 /mod/manage.php | |
| parent | e271035879660bc9996101f3a23d61c88ecd5f53 (diff) | |
| parent | 7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00 (diff) | |
| download | volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.gz volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.bz2 volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.zip | |
Merge branch 'tres'
Diffstat (limited to 'mod/manage.php')
| -rw-r--r-- | mod/manage.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mod/manage.php b/mod/manage.php index de5f9c8ad..bb6c010f6 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -56,7 +56,7 @@ function manage_content(&$a) { $channels[$x]['default_links'] = '1'; - $c = q("SELECT id, item_restrict, item_flags, item_wall FROM item + $c = q("SELECT id, item_restrict, item_wall FROM item WHERE item_restrict = 0 and item_unseen = 1 and uid = %d", intval($channels[$x]['channel_id']) ); @@ -71,11 +71,10 @@ 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_flags & %d)>0 and not ((abook_flags & %d)>0 or (xchan_flags & %d)>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_flags & %d)>0 and not ((abook_flags & %d)>0 or xchan_deleted = 1 or xchan_orphan = 1)", intval($channels[$x]['channel_id']), intval(ABOOK_FLAG_PENDING), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), - intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) + intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED) ); if($intr) |