mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
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
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user