aboutsummaryrefslogtreecommitdiffstats
path: root/mod/settings.php
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-08-03 00:04:26 +0200
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-08-03 00:04:26 +0200
commitc0cd147a3a9a86b270ea32026089ced16fb2f50c (patch)
tree77232d70031622a162f4e00aec128961ecc7a764 /mod/settings.php
parentd2d1e54bfe928fe4cdfdcfc7e9acf658cda76898 (diff)
parent1d816ba90ad3408822dc64f294597273fd19bc57 (diff)
downloadvolse-hubzilla-c0cd147a3a9a86b270ea32026089ced16fb2f50c.tar.gz
volse-hubzilla-c0cd147a3a9a86b270ea32026089ced16fb2f50c.tar.bz2
volse-hubzilla-c0cd147a3a9a86b270ea32026089ced16fb2f50c.zip
merge
Diffstat (limited to 'mod/settings.php')
-rw-r--r--mod/settings.php4
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'),