aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-05-19 10:20:14 +0200
committerMario Vavti <mario@mariovavti.com>2018-05-19 10:20:14 +0200
commit6abbadf6c80c52b77e58fb729e25fdd5cb27a8ac (patch)
tree0e8acb7d57ff34c42ad77d96f9c2b9937e5c776b /Zotlabs/Module
parent1ca6ef0f60da9fcfd3e640d0ff43af5fc033eac5 (diff)
parent8b4af7cf0ba59fe0a50ca7caf843569578ac3044 (diff)
downloadvolse-hubzilla-6abbadf6c80c52b77e58fb729e25fdd5cb27a8ac.tar.gz
volse-hubzilla-6abbadf6c80c52b77e58fb729e25fdd5cb27a8ac.tar.bz2
volse-hubzilla-6abbadf6c80c52b77e58fb729e25fdd5cb27a8ac.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Admin.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index 30f3dfa48..934312efe 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -100,8 +100,12 @@ class Admin extends \Zotlabs\Web\Controller {
}
// pending registrations
- $r = q("SELECT COUNT(id) AS rtotal FROM register WHERE uid != '0'");
- $pending = $r[0]['rtotal'];
+
+ $pdg = q("SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) > 0 ",
+ intval(ACCOUNT_PENDING)
+ );
+
+ $pending = (($pdg) ? count($pdg) : 0);
// available channels, primary and clones
$channels = array();