diff options
| author | Mario <mario@mariovavti.com> | 2019-02-18 09:41:38 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-02-18 09:41:38 +0100 |
| commit | 72eb44aebcb6541688ca624933a79b34562dbb36 (patch) | |
| tree | 5a1a39b82fd498dde6e9d12921533e1951465d92 /Zotlabs | |
| parent | a5b7590d3a12ba1c8469c6840d4a9f895787ed2e (diff) | |
| parent | b070503e773e5b9a95639b0df7e4bb515855054b (diff) | |
| download | volse-hubzilla-72eb44aebcb6541688ca624933a79b34562dbb36.tar.gz volse-hubzilla-72eb44aebcb6541688ca624933a79b34562dbb36.tar.bz2 volse-hubzilla-72eb44aebcb6541688ca624933a79b34562dbb36.zip | |
Merge branch 'dev' into 'dev'
MySQL 8 admin summary compatibility
See merge request hubzilla/core!1517
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Admin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 8ccdaf4f5..88b84b9d2 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -86,7 +86,7 @@ class Admin extends \Zotlabs\Web\Controller { // list total user accounts, expirations etc. $accounts = array(); - $r = q("SELECT COUNT(*) AS total, COUNT(CASE WHEN account_expires > %s THEN 1 ELSE NULL END) AS expiring, COUNT(CASE WHEN account_expires < %s AND account_expires > '%s' THEN 1 ELSE NULL END) AS expired, COUNT(CASE WHEN (account_flags & %d)>0 THEN 1 ELSE NULL END) AS blocked FROM account", + $r = q("SELECT COUNT(CASE WHEN account_id > 0 THEN 1 ELSE NULL END) AS total, COUNT(CASE WHEN account_expires > %s THEN 1 ELSE NULL END) AS expiring, COUNT(CASE WHEN account_expires < %s AND account_expires > '%s' THEN 1 ELSE NULL END) AS expired, COUNT(CASE WHEN (account_flags & %d)>0 THEN 1 ELSE NULL END) AS blocked FROM account", db_utcnow(), db_utcnow(), dbesc(NULL_DATE), |