aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Admin.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-09-05 21:02:06 -0700
committerzotlabs <mike@macgirvin.com>2018-09-05 21:02:06 -0700
commitc5bc4fe24519079664b8f63a5e9082f0a7ffc945 (patch)
tree9039d12215106b92b21f42977abbcdb44b529f65 /Zotlabs/Module/Admin.php
parentbc4a92b702618aa83991ea65eb24d653cfc6601a (diff)
parentea381d918021a33a73df40de95fd0c57f0edc5c2 (diff)
downloadvolse-hubzilla-c5bc4fe24519079664b8f63a5e9082f0a7ffc945.tar.gz
volse-hubzilla-c5bc4fe24519079664b8f63a5e9082f0a7ffc945.tar.bz2
volse-hubzilla-c5bc4fe24519079664b8f63a5e9082f0a7ffc945.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
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 2df8dc25d..6edced9b5 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -109,7 +109,7 @@ class Admin extends \Zotlabs\Web\Controller {
// available channels, primary and clones
$channels = array();
- $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 channel_removed = 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 channel_removed = 0 and channel_system = 0");
if ($r) {
$channels['total'] = array('label' => t('Channels'), 'val' => $r[0]['total']);
$channels['main'] = array('label' => t('Primary'), 'val' => $r[0]['main']);