diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-11-11 12:22:20 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-11-11 12:22:20 +0100 |
| commit | 7801bac09ac1fb5a10c0c518e1e7639233855220 (patch) | |
| tree | ce042bf0f0d978e81a5f9473e2f42845bba6121f /phpBB/includes/functions_acp.php | |
| parent | f4063e475dff62f68bdd4c813bf3450492abb3c1 (diff) | |
| parent | 023ec01611123c426a5aeaf812e50fb1ade43c0e (diff) | |
| download | forums-7801bac09ac1fb5a10c0c518e1e7639233855220.tar forums-7801bac09ac1fb5a10c0c518e1e7639233855220.tar.gz forums-7801bac09ac1fb5a10c0c518e1e7639233855220.tar.bz2 forums-7801bac09ac1fb5a10c0c518e1e7639233855220.tar.xz forums-7801bac09ac1fb5a10c0c518e1e7639233855220.zip | |
Merge branch 'prep-release-3.2.4' into 3.2.x
Diffstat (limited to 'phpBB/includes/functions_acp.php')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 8bf42aa36e..9b7491305c 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -564,9 +564,6 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) $cfg_array[$config_name] = trim($destination); - // Absolute file path - case 'absolute_path': - case 'absolute_path_writable': // Path being relative (still prefixed by phpbb_root_path), but with the ability to escape the root dir... case 'path': case 'wpath': @@ -585,7 +582,7 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) break; } - $path = in_array($config_definition['validate'], array('wpath', 'path', 'rpath', 'rwpath')) ? $phpbb_root_path . $cfg_array[$config_name] : $cfg_array[$config_name]; + $path = $phpbb_root_path . $cfg_array[$config_name]; if (!file_exists($path)) { @@ -598,7 +595,7 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) } // Check if the path is writable - if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath' || $config_definition['validate'] === 'absolute_path_writable') + if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath') { if (file_exists($path) && !$phpbb_filesystem->is_writable($path)) { |