aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-03-11 17:07:15 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-03-11 17:44:25 +0100
commit8aa22550b9e3e21ae6a744cc23a2d22a251afb3d (patch)
treeba99e1c5249945917f4489fc9061738a8321caa2 /phpBB/develop
parente1d570285388990bf280ece3b2041dcc2f409e67 (diff)
downloadforums-8aa22550b9e3e21ae6a744cc23a2d22a251afb3d.tar
forums-8aa22550b9e3e21ae6a744cc23a2d22a251afb3d.tar.gz
forums-8aa22550b9e3e21ae6a744cc23a2d22a251afb3d.tar.bz2
forums-8aa22550b9e3e21ae6a744cc23a2d22a251afb3d.tar.xz
forums-8aa22550b9e3e21ae6a744cc23a2d22a251afb3d.zip
[ticket/12262] Fix location list for acp events with "Locations:"
PHPBB3-12262
Diffstat (limited to 'phpBB/develop')
-rw-r--r--phpBB/develop/export_events_for_wiki.php15
1 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/develop/export_events_for_wiki.php b/phpBB/develop/export_events_for_wiki.php
index ac4c4f9317..f843c67113 100644
--- a/phpBB/develop/export_events_for_wiki.php
+++ b/phpBB/develop/export_events_for_wiki.php
@@ -54,7 +54,7 @@ function export_from_eventsmd($phpbb_root_path, $filter)
{
$file_details = substr($file_details, strlen("* Locations:\n + "));
$files = explode("\n + ", $file_details);
- $prosilver = $subsilver2 = array();
+ $prosilver = $subsilver2 = $adm = array();
foreach ($files as $file)
{
if (strpos($file, 'styles/prosilver/template/') === 0)
@@ -65,8 +65,19 @@ function export_from_eventsmd($phpbb_root_path, $filter)
{
$subsilver2[] = substr($file, strlen('styles/subsilver2/template/'));
}
+ if (strpos($file, 'adm/style/') === 0)
+ {
+ $adm[] = substr($file, strlen('adm/style/'));
+ }
+ }
+ if ($filter == 'acp')
+ {
+ echo implode(', ', $adm);
+ }
+ else
+ {
+ echo implode(', ', $prosilver) . ' || ' . implode(', ', $subsilver2);
}
- echo implode(', ', $prosilver) . ' || ' . implode(', ', $subsilver2);
}
else if ($filter == 'acp')
{