diff options
| author | Cesar G <prototech91@gmail.com> | 2014-08-10 13:08:15 +0200 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-08-10 13:08:15 +0200 |
| commit | 4056b84f6042602db8e407d50b6bf449cccd01e0 (patch) | |
| tree | 7a1b393076c540ed1c0c6eeeeff22d504e31ebeb /tests | |
| parent | 9e0c234979de205b4b4e7d1a25280edf86e0fd94 (diff) | |
| parent | 59780bbd091c9e162eaf5f399f9bb2440605c4f7 (diff) | |
| download | forums-4056b84f6042602db8e407d50b6bf449cccd01e0.tar forums-4056b84f6042602db8e407d50b6bf449cccd01e0.tar.gz forums-4056b84f6042602db8e407d50b6bf449cccd01e0.tar.bz2 forums-4056b84f6042602db8e407d50b6bf449cccd01e0.tar.xz forums-4056b84f6042602db8e407d50b6bf449cccd01e0.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/12958' into develop
* nickvergessen/ticket/12958:
[ticket/12958] Remove more references of subsilver2
[ticket/12958] Remove subsilver2 for phpBB 3.2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/event/md_exporter_test.php | 1 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/event/md_exporter_test.php b/tests/event/md_exporter_test.php index 0f9d855caa..28649e4f21 100644 --- a/tests/event/md_exporter_test.php +++ b/tests/event/md_exporter_test.php @@ -41,7 +41,6 @@ class phpbb_event_md_exporter_test extends phpbb_test_case $styles = array( 'adm/style/' => 'adm', 'styles/prosilver/template/' => 'styles', - 'styles/subsilver2/template/' => 'styles', ); foreach ($styles as $path => $filter) { diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 80e6293ff9..6a33fd7711 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -474,7 +474,7 @@ class phpbb_functional_test_case extends phpbb_test_case )); $db->sql_query($sql); - if ($style_path != 'prosilver' && $style_path != 'subsilver2') + if ($style_path != 'prosilver') { @mkdir($phpbb_root_path . 'styles/' . $style_path, 0777); @mkdir($phpbb_root_path . 'styles/' . $style_path . '/template', 0777); @@ -513,7 +513,7 @@ class phpbb_functional_test_case extends phpbb_test_case $db->sql_query('DELETE FROM ' . STYLES_TEMPLATE_TABLE . ' WHERE template_id = ' . $style_id); $db->sql_query('DELETE FROM ' . STYLES_THEME_TABLE . ' WHERE theme_id = ' . $style_id); - if ($style_path != 'prosilver' && $style_path != 'subsilver2') + if ($style_path != 'prosilver') { @rmdir($phpbb_root_path . 'styles/' . $style_path . '/template'); @rmdir($phpbb_root_path . 'styles/' . $style_path); |