aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-09 18:38:41 -0700
committerfriendica <info@friendica.com>2015-03-09 18:38:41 -0700
commitef035a29bc2240ccc497d76eb6e48f2434250082 (patch)
treeb7208de5ad76672cc097a60fe93465d1fc53a233 /mod
parentc3d20cfba906db9b679b99c9e5f623834dbbab11 (diff)
parenta611eed172cdec63f8007e74583178d12a9335ec (diff)
downloadvolse-hubzilla-ef035a29bc2240ccc497d76eb6e48f2434250082.tar.gz
volse-hubzilla-ef035a29bc2240ccc497d76eb6e48f2434250082.tar.bz2
volse-hubzilla-ef035a29bc2240ccc497d76eb6e48f2434250082.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'mod')
-rw-r--r--mod/admin.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/admin.php b/mod/admin.php
index 714548f04..8fb9866a7 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -189,7 +189,7 @@ function admin_page_summary(&$a) {
// list total user accounts, expirations etc.
$accounts = array();
- $r = q("SELECT COUNT(*) AS total, COUNT(IF(account_expires > %s, 1, NULL)) AS expiring, COUNT(IF(account_expires < %s AND account_expires != '%s', 1, NULL)) AS expired, COUNT(IF((account_flags & %d)>0, 1, NULL)) 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),
@@ -208,7 +208,7 @@ function admin_page_summary(&$a) {
// available channels, primary and clones
$channels = array();
- $r = q("SELECT COUNT(*) AS total, COUNT(IF(channel_primary = 1, 1, NULL)) AS main, COUNT(IF(channel_primary = 0, 1, NULL)) AS clones FROM channel WHERE NOT (channel_pageflags & %d)>0",
+ $r = q("SELECT COUNT(*) AS total, COUNT(CASE WHEN channel_primary = 1 THEN 1 ELSE NULL END) AS main, COUNT(CASE WHEN channel_primary = 0 THEN 1 ELSE NULL END) AS clones FROM channel WHERE NOT (channel_pageflags & %d)>0",
intval(PAGE_REMOVED)
);
if ($r) {