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 /phpBB/phpbb | |
| 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 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/event/md_exporter.php | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php index f7021875f3..84b10e79c1 100644 --- a/phpBB/phpbb/event/md_exporter.php +++ b/phpBB/phpbb/event/md_exporter.php @@ -89,7 +89,7 @@ class md_exporter { $this->crawl_eventsmd($md_file, 'styles'); - $styles = array('prosilver', 'subsilver2'); + $styles = array('prosilver'); foreach ($styles as $style) { $file_list = $this->get_recursive_file_list( @@ -179,7 +179,7 @@ class md_exporter { $wiki_page = '= Template Events =' . "\n"; $wiki_page .= '{| class="zebra sortable" cellspacing="0" cellpadding="5"' . "\n"; - $wiki_page .= '! Identifier !! Prosilver Placement (If applicable) !! Subsilver Placement (If applicable) !! Added in Release !! Explanation' . "\n"; + $wiki_page .= '! Identifier !! Prosilver Placement (If applicable) !! Added in Release !! Explanation' . "\n"; } foreach ($this->events as $event_name => $event) @@ -193,7 +193,7 @@ class md_exporter } else { - $wiki_page .= implode(', ', $event['files']['prosilver']) . ' || ' . implode(', ', $event['files']['subsilver2']); + $wiki_page .= implode(', ', $event['files']['prosilver']); } $wiki_page .= " || {$event['since']} || " . str_replace("\n", ' ', $event['description']) . "\n"; @@ -246,7 +246,6 @@ class md_exporter { $files_list = array( 'prosilver' => array(), - 'subsilver2' => array(), 'adm' => array(), ); @@ -266,10 +265,6 @@ class md_exporter { $files_list['prosilver'][] = substr($file, strlen('styles/prosilver/template/')); } - else if (($this->filter !== 'adm') && strpos($file, 'styles/subsilver2/template/') === 0) - { - $files_list['subsilver2'][] = substr($file, strlen('styles/subsilver2/template/')); - } else if (($this->filter === 'adm') && strpos($file, 'adm/style/') === 0) { $files_list['adm'][] = substr($file, strlen('adm/style/')); |