diff options
| author | Olivier van Helden <olivier@van-helden.net> | 2014-12-03 17:54:07 -0400 |
|---|---|---|
| committer | Olivier van Helden <olivier@van-helden.net> | 2014-12-03 17:54:07 -0400 |
| commit | e523061b7261439a71bdacf8f46d4c614740b356 (patch) | |
| tree | 1a0577c64197c4289ed154d2c2d5fdf48a7e5192 /mod/siteinfo.php | |
| parent | 13fd91d6f5723774a1b96257f8096acb2873b4ed (diff) | |
| parent | b71b45aafc618d32d23c099a4d4db8bad2f09e54 (diff) | |
| download | volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.tar.gz volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.tar.bz2 volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.zip | |
Merge pull request #1 from friendica/master
Merge master from friendica
Diffstat (limited to 'mod/siteinfo.php')
| -rw-r--r-- | mod/siteinfo.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/siteinfo.php b/mod/siteinfo.php index a58f17c53..03e578467 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -1,14 +1,15 @@ <?php function siteinfo_init(&$a) { - + global $db; + if ($a->argv[1]=="json"){ $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'); $directory_mode = Array('DIRECTORY_MODE_NORMAL', 'DIRECTORY_MODE_SECONDARY','DIRECTORY_MODE_PRIMARY', 'DIRECTORY_MODE_STANDALONE'); $sql_extra = ''; - $r = q("select * from channel left join account on account_id = channel_account_id where ( account_roles & 4096 ) and account_default_channel = channel_id"); + $r = q("select * from channel left join account on account_id = channel_account_id where ( account_roles & 4096 )>0 and account_default_channel = channel_id"); if($r) { @@ -71,6 +72,7 @@ function siteinfo_init(&$a) { 'admin' => $admin, 'site_name' => (($site_name) ? $site_name : ''), 'platform' => RED_PLATFORM, + 'dbdriver' => $db->getdriver(), 'info' => (($site_info) ? $site_info : ''), 'channels_total' => $channels_total_stat, 'channels_active_halfyear' => $channels_active_halfyear_stat, |