diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-11-18 15:28:57 -0800 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-11-18 15:28:57 -0800 |
| commit | c31787436e246b8c28d07dd55142f52188d7bb72 (patch) | |
| tree | a79d2c3354626f294ec9db77362913227a96bb7f | |
| parent | ace66f861a38e2368a1634a8b67c53906552499e (diff) | |
| parent | 5fe822021bc284f756ca9361f15220dbbefb31d4 (diff) | |
| download | forums-c31787436e246b8c28d07dd55142f52188d7bb72.tar forums-c31787436e246b8c28d07dd55142f52188d7bb72.tar.gz forums-c31787436e246b8c28d07dd55142f52188d7bb72.tar.bz2 forums-c31787436e246b8c28d07dd55142f52188d7bb72.tar.xz forums-c31787436e246b8c28d07dd55142f52188d7bb72.zip | |
Merge pull request #1877 from nickvergessen/ticket/12023
Ticket/12023 New css files missing after update
| -rw-r--r-- | phpBB/includes/functions_install.php | 2 | ||||
| -rw-r--r-- | tests/functions_install/ignore_new_file_on_update_test.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 10e9878cc8..deb304b838 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -569,7 +569,7 @@ function phpbb_ignore_new_file_on_update($phpbb_root_path, $file) if (!$ignore_new_file && strpos($file, 'styles/') === 0) { $dirs = explode('/', $file); - if ($dirs >= 5) + if (sizeof($dirs) >= 5) { list($styles_dir, $style_name, $template_component, $language_iso) = explode('/', $file); if ($template_component == 'theme' && $language_iso !== 'images') diff --git a/tests/functions_install/ignore_new_file_on_update_test.php b/tests/functions_install/ignore_new_file_on_update_test.php index ae1dde96f7..703da4e435 100644 --- a/tests/functions_install/ignore_new_file_on_update_test.php +++ b/tests/functions_install/ignore_new_file_on_update_test.php @@ -25,6 +25,8 @@ class phpbb_functions_install_ignore_new_file_on_update_test extends phpbb_test_ array('styles/prosilver/theme/en/icon_user_online.gif', false), array('styles/prosilver/theme/languagewillneverexist/icon_user_online.gif', true), + + array('styles/prosilver/theme/imageset.css', false), ); } |