aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Admin.php
diff options
context:
space:
mode:
authorredmatrix <mike@macgirvin.com>2016-09-26 18:17:38 -0700
committerredmatrix <mike@macgirvin.com>2016-09-26 18:17:38 -0700
commit4663278f52fd11c1014d13151af2bc6ef1392c7d (patch)
tree5ea36ed7db723a1d0abfd99c5e7d21f9e72cf12a /Zotlabs/Module/Admin.php
parent5716556766eb4e329f0c6c1bc899a7621cbcd5a5 (diff)
parentcacdac16aa104eb1308f69f24fef31f682934fca (diff)
downloadvolse-hubzilla-4663278f52fd11c1014d13151af2bc6ef1392c7d.tar.gz
volse-hubzilla-4663278f52fd11c1014d13151af2bc6ef1392c7d.tar.bz2
volse-hubzilla-4663278f52fd11c1014d13151af2bc6ef1392c7d.zip
Merge branch 'nulldate' into dev
Diffstat (limited to 'Zotlabs/Module/Admin.php')
-rw-r--r--Zotlabs/Module/Admin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index e6a29fd8d..e3702992f 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -87,7 +87,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(*) 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),