[ticket/15392] Removed realpath only where needed

PHPBB3-15392
This commit is contained in:
DinHere 2017-12-03 22:33:45 +02:00 committed by Marc Alexander
parent 448b6a7d49
commit f3d3b493f7
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 8 additions and 8 deletions

View file

@ -20,10 +20,10 @@
// //
die("Please read the first lines of this script for instructions on how to enable it"); die("Please read the first lines of this script for instructions on how to enable it");
$namespace_dir = __DIR__ . '/../phpbb/'; $namespace_dir = realpath(__DIR__ . '/../phpbb/');
$code_dir = __DIR__ . '/../'; $code_dir = realpath(__DIR__ . '/../');
$test_dir = __DIR__ . '/../../tests/'; $test_dir = realpath(__DIR__ . '/../../tests/');
$config_dir = __DIR__ . '/../config/'; $config_dir = realpath(__DIR__ . '/../config/');
function map_class_name($old_class_name, $code_dir) function map_class_name($old_class_name, $code_dir)
{ {

View file

@ -20,8 +20,8 @@
// //
die("Please read the first lines of this script for instructions on how to enable it"); die("Please read the first lines of this script for instructions on how to enable it");
$code_dir = __DIR__ . '/../'; $code_dir = realpath(__DIR__ . '/../');
$test_dir = __DIR__ . '/../../tests/'; $test_dir = realpath(__DIR__ . '/../../tests/');
$iterator = new \AppendIterator(); $iterator = new \AppendIterator();
$iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($code_dir))); $iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($code_dir)));
$iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($test_dir))); $iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($test_dir)));

View file

@ -3240,12 +3240,12 @@ function phpbb_filter_root_path($errfile)
{ {
if ($phpbb_filesystem) if ($phpbb_filesystem)
{ {
$root_path = $phpbb_filesystem-> __DIR__ . '/../'; $root_path = $phpbb_filesystem-> realpath(__DIR__ . '/../');
} }
else else
{ {
$filesystem = new \phpbb\filesystem\filesystem(); $filesystem = new \phpbb\filesystem\filesystem();
$root_path = $filesystem-> __DIR__ . '/../'; $root_path = $filesystem-> realpath(__DIR__ . '/../');
} }
} }