Merge branch 'develop' into space_before_t

diff --cc mod/settings.php
index eebac66781aee22736e5a8ce6836687c12e53fae,67aa40de5b74657d11515dbb4e4a091251ce6868..1d83251d4b327054c61e481aca3a86ad5361555e
--- 1/mod/settings.php
--- 2/mod/settings.php
+++ b/mod/settings.php
@@@ -1164,17 -1164,17 +1164,17 @@@ function settings_content(App $a) 
        }
  
        $opt_tpl = get_markup_template("field_yesno.tpl");
--      if(get_config('system','publish_all')) {
++      if (get_config('system','publish_all')) {
                $profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
        } else {
--              $profile_in_dir = replace_macros($opt_tpl,array(
-                       '$field'        => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'), t('Yes'))),
 -                      '$field'        => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'),t('Yes')))
++              $profile_in_dir = replace_macros($opt_tpl, array(
++                      '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'), t('Yes')))
                ));
        }
  
        if (strlen(get_config('system','directory'))) {
--              $profile_in_net_dir = replace_macros($opt_tpl,array(
-                       '$field'        => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes'))),
 -                      '$field'        => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes')))
++              $profile_in_net_dir = replace_macros($opt_tpl, array(
++                      '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes')))
                ));
        } else {
                $profile_in_net_dir = '';