diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-03-12 09:37:29 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-03-12 09:37:29 +0100 |
| commit | b265a55b815e46658aadec9021bb00997cb40bc7 (patch) | |
| tree | 699000bdfe3f076ceaf92e2a2147ab1856c0f5e7 /Zotlabs/Module/Admin | |
| parent | ade11568f9dc094b124a442914d107cd3235f6e8 (diff) | |
| parent | 717ae5486806f7f238f6cdafe08c8aefd94056d2 (diff) | |
| download | volse-hubzilla-b265a55b815e46658aadec9021bb00997cb40bc7.tar.gz volse-hubzilla-b265a55b815e46658aadec9021bb00997cb40bc7.tar.bz2 volse-hubzilla-b265a55b815e46658aadec9021bb00997cb40bc7.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Admin')
| -rw-r--r-- | Zotlabs/Module/Admin/Site.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index bfb9be8bd..95d44d754 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -39,6 +39,11 @@ class Site { $site_location = ((x($_POST,'site_location')) ? notags(trim($_POST['site_location'])) : ''); $frontpage = ((x($_POST,'frontpage')) ? notags(trim($_POST['frontpage'])) : ''); $firstpage = ((x($_POST,'firstpage')) ? notags(trim($_POST['firstpage'])) : 'profiles'); + $first_page = ((x($_POST,'first_page')) ? notags(trim($_POST['first_page'])) : 'profiles'); + // check value after trim + if(! $first_page) { + $first_page = 'profiles'; + } $mirror_frontpage = ((x($_POST,'mirror_frontpage')) ? intval(trim($_POST['mirror_frontpage'])) : 0); $directory_server = ((x($_POST,'directory_server')) ? trim($_POST['directory_server']) : ''); $allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : ''); @@ -82,7 +87,7 @@ class Site { set_config('system', 'maxloadavg', $maxloadavg); set_config('system', 'frontpage', $frontpage); set_config('system', 'sellpage', $site_sellpage); - set_config('system', 'workflow_channel_next', $firstpage); + set_config('system', 'workflow_channel_next', $first_page); set_config('system', 'site_location', $site_location); set_config('system', 'mirror_frontpage', $mirror_frontpage); set_config('system', 'sitename', $sitename); @@ -345,7 +350,7 @@ class Site { '$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')), '$sellpage' => array('site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), get_config('system','sellpage',''), sprintf( t('Create this page first. Default is %s/register'),z_root())), - '$firstpage' => array('firstpage', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Recommend: profiles, go, or settings')), + '$first_page' => array('first_page', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Recommend: profiles, go, or settings')), '$location' => array('site_location', t('Optional: site location'), get_config('system','site_location',''), t('Region or country')), |