aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-09-15 17:10:11 +0100
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-09-15 17:10:11 +0100
commit68ecc673b109be50dc04cf72af8ce2296c70b86b (patch)
tree0ecaa24425d2f69528ad99763d929cccd677d148 /mod
parente3b967f475e8933567ba7d80dacb6d496224fe55 (diff)
parenteaf3bd3326a657662321df791280b41293f54ef2 (diff)
downloadvolse-hubzilla-68ecc673b109be50dc04cf72af8ce2296c70b86b.tar.gz
volse-hubzilla-68ecc673b109be50dc04cf72af8ce2296c70b86b.tar.bz2
volse-hubzilla-68ecc673b109be50dc04cf72af8ce2296c70b86b.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod')
-rw-r--r--mod/siteinfo.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 061989413..01355a51d 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -13,7 +13,13 @@ function siteinfo_init(&$a) {
if($r) {
$admin = array();
foreach($r as $rr) {
- $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . get_app()->get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']);
+ if($rr['channel_pageflags'] & PAGE_HUBADMIN)
+ $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . get_app()->get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']);
+ }
+ if(! $admin) {
+ foreach($r as $rr) {
+ $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . get_app()->get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']);
+ }
}
}
else {