diff options
| author | zottel <github@zottel.net> | 2014-02-17 08:17:47 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2014-02-17 08:17:47 +0100 |
| commit | 2bca2199112625593eb412584e17e874e71ca913 (patch) | |
| tree | c6679ddb544217a10d8255578009c4ba8951bc6b /mod/admin.php | |
| parent | 54727d3a66df92596378ea7f5c412d5e6037b037 (diff) | |
| parent | f38ab0904101366bf536d46ab460dcd5cf4f60ca (diff) | |
| download | volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.tar.gz volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.tar.bz2 volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/admin.php')
| -rw-r--r-- | mod/admin.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/admin.php b/mod/admin.php index 01296bd29..c4a284941 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -706,9 +706,10 @@ function admin_page_users(&$a){ $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, " . "`account_service_class`, ( account_flags & %d ) > 0 as `blocked`, " . "(SELECT GROUP_CONCAT( ch.channel_address SEPARATOR ' ') FROM channel as ch " . - "WHERE ch.channel_account_id = ac.account_id) as `channels` " . + "WHERE ch.channel_account_id = ac.account_id and not (ch.channel_pageflags & %d )) as `channels` " . "FROM account as ac where true $serviceclass $order limit %d , %d ", - intval(ACCOUNT_BLOCKED), + intval(ACCOUNT_BLOCKED), + intval(PAGE_REMOVED), intval($a->pager['start']), intval($a->pager['itemspage']) ); |