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

[ticket/12325] Add files located in deleted dirs

Browse source 
PHPBB3-12325
This commit is contained in:
Tristan Darricau 2014-05-05 16:19:09 +02:00 • committed by Tristan Darricau
parent c5f5520013
commit 81ac5e7a00
1 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
build/build_helper.php
View file

@ -328,8 +328,9 @@ class build_package
} }
$line = str_replace('Only in ' . $package_name, '', $line); $line = str_replace('Only in ' . $package_name, '', $line);
$line = ltrim($line, '/');
if (substr(0, 1, $line) == '/') if (substr($line, 0, 1) == ':')
{ {
$replace = ''; $replace = '';
} }
@ -339,11 +340,36 @@ class build_package
} }
$line = str_replace(': ', $replace, $line); $line = str_replace(': ', $replace, $line);
$line = ltrim($line, '/');
$result[] = $line; if (is_dir("{$this->locations['old_versions']}{$package_name}/{$line}"))
{
$this->add_files_recursive($result, "{$this->locations['old_versions']}{$package_name}/{$line}", $line);
}
else
{
$result[] = $line;
}
} }
return $result; return $result;
} }
function add_files_recursive(array &$result, $directory_absolute, $directory)
{
$files = scandir($directory_absolute);
foreach ($files as $file)
{
if (is_dir($directory_absolute . '/' . $file))
{
if ($file != '.' && $file != '..')
{
$this->add_files_recursive($result, $directory_absolute . '/' . $file, $directory . '/' . $file);
}
}
else
{
$result[] = $directory . '/' . $file;
}
}
}
} }