diff options
author | Derky <derky@phpbb.com> | 2018-10-23 23:51:55 +0200 |
---|---|---|
committer | Derky <derky@phpbb.com> | 2018-10-23 23:57:24 +0200 |
commit | d753351edc04a45c61411ee09607fb932d314617 (patch) | |
tree | 786d721e1cfac4866705114494982a2e45bcd467 /phpBB/includes/functions_acp.php | |
parent | ae6c3b0d34c662f107fb7cb8d9e26e5bd252a3b3 (diff) | |
download | forums-d753351edc04a45c61411ee09607fb932d314617.tar forums-d753351edc04a45c61411ee09607fb932d314617.tar.gz forums-d753351edc04a45c61411ee09607fb932d314617.tar.bz2 forums-d753351edc04a45c61411ee09607fb932d314617.tar.xz forums-d753351edc04a45c61411ee09607fb932d314617.zip |
[ticket/security/227] Replace ImageMagick support with thumbnail event
SECURITY-227
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)) { |