1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00

- do not include if there are no files fetched with glob()

- allow options for merged files on update (merge, new file, old file)


git-svn-id: file:///svn/phpbb/trunk@7848 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-07-09 11:33:14 +00:00
parent c923e4191a
commit 179c77ccdd
6 changed files with 117 additions and 12 deletions

View File

@@ -127,10 +127,14 @@ class p_master
if (file_exists($user->lang_path . 'mods'))
{
$add_files = array();
$info_files = glob($user->lang_path . 'mods/info_' . strtolower($this->p_class) . '_*.' . $phpEx, GLOB_NOSORT);
foreach (glob($user->lang_path . 'mods/info_' . strtolower($this->p_class) . '_*.' . $phpEx, GLOB_NOSORT) as $file)
if ($info_files !== false && sizeof($info_files))
{
$add_files[] = 'mods/' . substr(basename($file), 0, -(strlen($phpEx) + 1));
foreach ($info_files as $file)
{
$add_files[] = 'mods/' . substr(basename($file), 0, -(strlen($phpEx) + 1));
}
}
if (sizeof($add_files))