mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/15747] Add test

Browse Source 
PHPBB3-15747
This commit is contained in:
Rubén Calvo
2018-08-15 01:01:43 +02:00
parent 225a6e2cbe
commit b2d7406381
3 changed files with 179 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
phpBB/phpbb/storage/adapter/local.php
View File

@@ -256,17 +256,20 @@ class local implements adapter_interface, stream_interface
*/
protected function remove_empty_dirs($path)
{
$dirpath = dirname($this->root_path . $path);
$filepath = dirname($this->root_path . $this->get_path($path) . $this->get_filename($path));
$path = filesystem_helper::make_path_relative($filepath, $dirpath);
do
if ($this->subfolders)
{
$parts = explode('/', $path);
$parts = array_slice($parts, 0, -1);
$path = implode('/', $parts);
$dirpath = dirname($this->root_path . $path);
$filepath = dirname($this->root_path . $this->get_path($path) . $this->get_filename($path));
$path = filesystem_helper::make_path_relative($filepath, $dirpath);
do
{
$parts = explode('/', $path);
$parts = array_slice($parts, 0, -1);
$path = implode('/', $parts);
}
while ($path && @rmdir($dirpath . '/' . $path));
}
while ($path && @rmdir($dirpath . '/' . $path));
}
/**
@@ -277,6 +280,9 @@ class local implements adapter_interface, stream_interface
*/
protected function get_path($path)
{
$dirname = dirname($path);
$dirname = ($dirname != '.') ? $dirname . DIRECTORY_SEPARATOR : '';
if ($this->subfolders)
{
$hash = md5(basename($path));
@@ -284,17 +290,13 @@ class local implements adapter_interface, stream_interface
$parts = str_split($hash, 2);
$parts = array_slice($parts, 0, $this->dir_depth);
// Create path
$dirname = dirname($path);
$path = $dirname . DIRECTORY_SEPARATOR;
if (!empty($parts))
{
$path .= implode(DIRECTORY_SEPARATOR, $parts) . DIRECTORY_SEPARATOR;
$dirname .= implode(DIRECTORY_SEPARATOR, $parts) . DIRECTORY_SEPARATOR;
}
}
return $path;
return $dirname;
}
/**