diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-12-23 10:09:46 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-12-23 10:09:46 +0100 |
| commit | 3b9b03cf86979b28e7fa249133176bed84b0105c (patch) | |
| tree | 336dc8b8b9627e7f4a93e5c35fe3e98555274616 /Zotlabs/Module/Admin/Accounts.php | |
| parent | 2e5a993f880d619aedf3693927e7b3e164fbfcc0 (diff) | |
| parent | ef39c1e94b5149a3019d417d08dc7c16c8aef9c1 (diff) | |
| download | volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.tar.gz volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.tar.bz2 volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.zip | |
Merge branch '2.0RC'
Diffstat (limited to 'Zotlabs/Module/Admin/Accounts.php')
| -rw-r--r-- | Zotlabs/Module/Admin/Accounts.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zotlabs/Module/Admin/Accounts.php b/Zotlabs/Module/Admin/Accounts.php index 143d00a3b..2043550fc 100644 --- a/Zotlabs/Module/Admin/Accounts.php +++ b/Zotlabs/Module/Admin/Accounts.php @@ -133,10 +133,9 @@ class Accounts { $base = z_root() . '/admin/accounts?f='; $odir = (($dir === 'asc') ? '0' : '1'); - $users = q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, " . "`account_service_class`, ( account_flags & %d ) > 0 as `blocked`, " . - "(SELECT %s FROM channel as ch " . - "WHERE ch.channel_account_id = ac.account_id and ch.channel_removed = 0 ) as `channels` " . - "FROM account as ac where true $serviceclass order by $key $dir limit %d offset %d ", + $users = q("SELECT account_id , account_email, account_lastlog, account_created, account_expires, account_service_class, ( account_flags & %d ) > 0 as blocked, + (SELECT %s FROM channel as ch WHERE ch.channel_account_id = ac.account_id and ch.channel_removed = 0 ) as channels FROM account as ac + where true $serviceclass order by $key $dir limit %d offset %d ", intval(ACCOUNT_BLOCKED), db_concat('ch.channel_address', ' '), intval(\App::$pager['itemspage']), |