diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-11-07 12:56:10 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-11-07 13:12:58 +0100 |
| commit | 7aa4d8fce2e61776d5f2dbf67386a589bcd7d634 (patch) | |
| tree | 8b881f3eda39fa86d045561cf7bda01c872d9fda /phpBB/install/install_update.php | |
| parent | cc54e6a9e58cb57fad87fc5b17e3c885531bc4e6 (diff) | |
| download | forums-7aa4d8fce2e61776d5f2dbf67386a589bcd7d634.tar forums-7aa4d8fce2e61776d5f2dbf67386a589bcd7d634.tar.gz forums-7aa4d8fce2e61776d5f2dbf67386a589bcd7d634.tar.bz2 forums-7aa4d8fce2e61776d5f2dbf67386a589bcd7d634.tar.xz forums-7aa4d8fce2e61776d5f2dbf67386a589bcd7d634.zip | |
[ticket/11927] Correctly add new files on update
Currently we ignore language and style files when the directory where they
go to do not exist. However in 3.1 we introduce some new sub directories:
* language/en/email/short/
* styles/prosilver/theme/en/
So we need to change our check to look whether the language or style exist,
rather then the parent directory.
PHPBB3-11927
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index b7b358ab2f..67420803c9 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -1311,7 +1311,7 @@ class install_update extends module } }*/ - if (file_exists($phpbb_root_path . dirname($file)) || (strpos($file, 'styles/') !== 0 && strpos($file, 'language/') !== 0)) + if (!ignore_new_file_on_update($phpbb_root_path, $file)) { $this->get_custom_info($update_list['new'], $file); $update_list['new'][] = array('filename' => $file, 'custom' => false); |