diff options
| author | friendica <info@friendica.com> | 2013-06-21 21:36:48 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-06-21 21:36:48 -0700 |
| commit | f835737cb7f8174b69145750be11fe4b896e8820 (patch) | |
| tree | fb8c21089c826d24a3f7d92787a9a34ec4d4b929 /mod/admin.php | |
| parent | b0fdfd0ca3b751f844665f4f3e64e909fb393dd0 (diff) | |
| download | volse-hubzilla-f835737cb7f8174b69145750be11fe4b896e8820.tar.gz volse-hubzilla-f835737cb7f8174b69145750be11fe4b896e8820.tar.bz2 volse-hubzilla-f835737cb7f8174b69145750be11fe4b896e8820.zip | |
fix some anomolies in config functions
Diffstat (limited to 'mod/admin.php')
| -rw-r--r-- | mod/admin.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/admin.php b/mod/admin.php index 670e89066..1fb729846 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -280,7 +280,7 @@ function admin_page_site_post(&$a){ set_config('system','delivery_interval',$delivery_interval); set_config('system','poll_interval',$poll_interval); set_config('system','maxloadavg',$maxloadavg); - set_config('config','sitename',$sitename); + set_config('system','sitename',$sitename); if ($banner=="") { del_config('system','banner'); @@ -402,7 +402,7 @@ function admin_page_site(&$a) { '$baseurl' => $a->get_baseurl(true), // name, label, value, help string, extra data... - '$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""), + '$sitename' => array('sitename', t("Site name"), htmlentities(get_config('system','sitename'), ENT_QUOTES), ""), '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices), @@ -410,8 +410,8 @@ function admin_page_site(&$a) { '$theme_accessibility' => array('theme-accessibility', t("Accessibility system theme"), get_config('system','accessibility-theme'), t("Accessibility theme"), $theme_choices_accessibility), '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), - '$register_policy' => array('register_policy', t("Register policy"), $a->config['system']['register_policy'], "", $register_choices), - '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), + '$register_policy' => array('register_policy', t("Register policy"), get_config('system','register_policy'), "", $register_choices), + '$register_text' => array('register_text', t("Register text"), htmlentities(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), |