diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-08-03 00:18:14 +0200 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-08-03 00:18:14 +0200 |
| commit | f09ac4e5972a77dfe73338ee207e40ec463355e9 (patch) | |
| tree | 77232d70031622a162f4e00aec128961ecc7a764 /mod/settings.php | |
| parent | 9294f72adb3c076932558b6f29a4c570e7962764 (diff) | |
| download | volse-hubzilla-f09ac4e5972a77dfe73338ee207e40ec463355e9.tar.gz volse-hubzilla-f09ac4e5972a77dfe73338ee207e40ec463355e9.tar.bz2 volse-hubzilla-f09ac4e5972a77dfe73338ee207e40ec463355e9.zip | |
Revert "Revert "merge""
This reverts commit 9294f72adb3c076932558b6f29a4c570e7962764.
Diffstat (limited to 'mod/settings.php')
| -rw-r--r-- | mod/settings.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/settings.php b/mod/settings.php index 6ab036437..0cca41810 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -336,6 +336,7 @@ function settings_post(&$a) { $expire_network_only = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only']) : 0); $allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0); + $publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0); $page_flags = (((x($_POST,'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0); $blockwall = (((x($_POST,'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted! @@ -460,6 +461,7 @@ function settings_post(&$a) { set_pconfig(local_user(),'system','post_profilechange', $post_profilechange); set_pconfig(local_user(),'system','blocktags',$blocktags); + /* if($page_flags == PAGE_PRVGROUP) { $hidewall = 1; @@ -1017,7 +1019,7 @@ function settings_content(&$a) { '$email' => array('email', t('Email Address:'), $email, ''), '$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''), '$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''), - '$allowloc' => array('allow_location', t('Use Browser Location:'), (intval(get_pconfig(local_user(),'system','use_browser_location')) == 1), ''), + '$allowloc' => array('allow_location', t('Use Browser Location:'), ((get_pconfig(local_user(),'system','use_browser_location')) ? 1 : ''), ''), '$h_prv' => t('Security and Privacy Settings'), |