makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15392] Resolve incorrect replacements after code review

Browse source 
PHPBB3-15392
This commit is contained in:
DinHere 2017-12-03 22:58:46 +02:00 • committed by Marc Alexander
parent f3d3b493f7
commit 20d4a86016
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Vagrantfile vendored
View file

@ -2,7 +2,7 @@ require 'json'
require 'yaml' require 'yaml'
VAGRANTFILE_API_VERSION ||= "2" VAGRANTFILE_API_VERSION ||= "2"
confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.__DIR__) confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__))
homesteadYamlPath = "vagrant/bootstrap.yaml" homesteadYamlPath = "vagrant/bootstrap.yaml"
afterScriptPath = "vagrant/after.sh" afterScriptPath = "vagrant/after.sh"

4
phpBB/includes/functions.php
View file

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