diff options
| -rw-r--r-- | conf/dokuwiki.php | 2 | ||||
| -rw-r--r-- | inc/init.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 7bcd8bcbc..227c08043 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -8,7 +8,7 @@ /* Datastorage and Permissions */ -$conf['umask'] = 0002; //set the global umask +$conf['umask'] = ''; //set the global umask - empty for system default $conf['fmode'] = 0666; //set file creation mode $conf['dmode'] = 0777; //set direction creation mode diff --git a/inc/init.php b/inc/init.php index fc7e5abec..1557070e5 100644 --- a/inc/init.php +++ b/inc/init.php @@ -65,7 +65,7 @@ if (!empty($_POST)) remove_magic_quotes($_POST); if (!empty($_COOKIE)) remove_magic_quotes($_COOKIE); if (!empty($_REQUEST)) remove_magic_quotes($_REQUEST); - if (!empty($_SESSION)) remove_magic_quotes($_SESSION); +# if (!empty($_SESSION)) remove_magic_quotes($_SESSION); #FIXME needed ? @ini_set('magic_quotes_gpc', 0); define('MAGIC_QUOTES_STRIPPED',1); } @@ -85,13 +85,13 @@ } // Set defaults for fmode, dmode and umask. - if(!isset($conf['fmode'])) { + if(!isset($conf['fmode']) || $conf['fmode'] === '') { $conf['fmode'] = 0666; } - if(!isset($conf['dmode'])) { + if(!isset($conf['dmode']) || $conf['dmode'] === '') { $conf['dmode'] = 0777; } - if(!isset($conf['umask'])) { + if(!isset($conf['umask']) || $conf['umask'] === '') { $conf['umask'] = umask(); } |