From 1cf8554d0efc00b19062a75e54e86c0926f251ff Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Thu, 6 Mar 2014 23:51:49 +0530 Subject: [PATCH 1/2] [ticket/12250] Remove deprecated phpbb_clean_path function The function phpbb_clean_path() in functions.php is deprecated as is not used used 3.0/3.1 core PHPBB3-12250 --- phpBB/includes/functions.php | 40 ------------------------------------ 1 file changed, 40 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index aca1443cce..03cd235f86 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -850,46 +850,6 @@ else } } -/** -* Eliminates useless . and .. components from specified path. -* -* Deprecated, use filesystem class instead -* -* @param string $path Path to clean -* @return string Cleaned path -* -* @deprecated -*/ -function phpbb_clean_path($path) -{ - global $phpbb_path_helper, $phpbb_container; - - if (!$phpbb_path_helper && $phpbb_container) - { - $phpbb_path_helper = $phpbb_container->get('path_helper'); - } - else if (!$phpbb_path_helper) - { - // The container is not yet loaded, use a new instance - if (!class_exists('\phpbb\path_helper')) - { - global $phpbb_root_path, $phpEx; - require($phpbb_root_path . 'phpbb/path_helper.' . $phpEx); - } - - $phpbb_path_helper = new phpbb\path_helper( - new phpbb\symfony_request( - new phpbb\request\request() - ), - new phpbb\filesystem(), - $phpbb_root_path, - $phpEx - ); - } - - return $phpbb_path_helper->clean_path($path); -} - // functions used for building option fields /** From 429c00644025fa5858370e3315ee4e83427ac249 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Fri, 7 Mar 2014 03:44:28 +0530 Subject: [PATCH 2/2] [ticket/12250] Remove deprecated phpbb_clean_path function The function phpbb_clean_path() in functions.php is deprecated and is replaced by filesystem class. Therefore, this function is moved to the functions_compatibility file. PHPBB3-12250 --- phpBB/includes/functions_compatibility.php | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index 62c2ba6905..024c656267 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -83,3 +83,43 @@ function phpbb_check_hash($password, $hash) $passwords_manager = $phpbb_container->get('passwords.manager'); return $passwords_manager->check($password, $hash); } + +/** +* Eliminates useless . and .. components from specified path. +* +* Deprecated, use filesystem class instead +* +* @param string $path Path to clean +* @return string Cleaned path +* +* @deprecated +*/ +function phpbb_clean_path($path) +{ + global $phpbb_path_helper, $phpbb_container; + + if (!$phpbb_path_helper && $phpbb_container) + { + $phpbb_path_helper = $phpbb_container->get('path_helper'); + } + else if (!$phpbb_path_helper) + { + // The container is not yet loaded, use a new instance + if (!class_exists('\phpbb\path_helper')) + { + global $phpbb_root_path, $phpEx; + require($phpbb_root_path . 'phpbb/path_helper.' . $phpEx); + } + + $phpbb_path_helper = new phpbb\path_helper( + new phpbb\symfony_request( + new phpbb\request\request() + ), + new phpbb\filesystem(), + $phpbb_root_path, + $phpEx + ); + } + + return $phpbb_path_helper->clean_path($path); +}