diff options
| author | friendica <info@friendica.com> | 2014-08-28 03:33:19 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-08-28 03:33:19 -0700 |
| commit | 5e5c6c90002908ed2052659a5fe13319c09883b0 (patch) | |
| tree | bab5b50619aae4b92a343635599fd9f40c4aaba5 | |
| parent | ed4896def1f90d903919311312fee974384540d7 (diff) | |
| download | volse-hubzilla-5e5c6c90002908ed2052659a5fe13319c09883b0.tar.gz volse-hubzilla-5e5c6c90002908ed2052659a5fe13319c09883b0.tar.bz2 volse-hubzilla-5e5c6c90002908ed2052659a5fe13319c09883b0.zip | |
consistency: the diaspora post plugin uses "diaspora_enable". The protocol driver uses "diaspora_enabled" with a 'd'. They got mixed up in a couple of places.
| -rw-r--r-- | mod/admin.php | 6 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mod/admin.php b/mod/admin.php index 82d199a9b..31d3873ff 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -266,11 +266,11 @@ function admin_page_site_post(&$a){ $poll_interval = ((x($_POST,'poll_interval'))? intval(trim($_POST['poll_interval'])) : 0); $maxloadavg = ((x($_POST,'maxloadavg'))? intval(trim($_POST['maxloadavg'])) : 50); $feed_contacts = ((x($_POST,'feed_contacts')) ? intval($_POST['feed_contacts']) : 0); - $diaspora_enable = ((x($_POST,'diaspora_enable')) ? intval($_POST['diaspora_enable']) : 0); + $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? intval($_POST['diaspora_enabled']) : 0); set_config('system','feed_contacts',$feed_contacts); - set_config('system','diaspora_enable',$diaspora_enable); + set_config('system','diaspora_enabled',$diaspora_enabled); set_config('system','delivery_interval',$delivery_interval); set_config('system','poll_interval',$poll_interval); set_config('system','maxloadavg',$maxloadavg); @@ -426,7 +426,7 @@ function admin_page_site(&$a) { '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), '$theme_accessibility' => array('theme_accessibility', t("Accessibility system theme"), get_config('system','accessibility_theme'), t("Accessibility theme"), $theme_choices_accessibility), '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), - '$diaspora_enable' => array('diaspora_enable',t('Enable Diaspora Protocol'), get_config('system','diaspora_enable'), t('Communicate with Diaspora and Friendica - experimental')), + '$diaspora_enabled' => array('diaspora_enabled',t('Enable Diaspora Protocol'), get_config('system','diaspora_enabled'), t('Communicate with Diaspora and Friendica - experimental')), '$feed_contacts' => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')), '$maximagesize' => array('maximagesize', t("Maximum image size"), intval(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("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices), diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 6736792a8..930486b5f 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -65,7 +65,7 @@ <h3>{{$corporate}}</h3> {{include file="field_checkbox.tpl" field=$block_public}} - {{include file="field_checkbox.tpl" field=$diaspora_enable}} + {{include file="field_checkbox.tpl" field=$diaspora_enabled}} {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$disable_discover_tab}} |