aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/event
diff options
context:
space:
mode:
author3Di <three3di@hotmail.it>2018-10-26 18:33:30 +0200
committerGitHub <noreply@github.com>2018-10-26 18:33:30 +0200
commit379900b4eda527d91c2e3252db5e3b89038bc425 (patch)
tree6c8db1854d475b2b15c1b5c98c77e5f9f9fa1ff3 /phpBB/phpbb/event
parent001f32da95d4f8697ccc9a6107afc8dc68cbe48e (diff)
parentfd95355c6129043e09d189c193ff5d1abde8db96 (diff)
downloadforums-379900b4eda527d91c2e3252db5e3b89038bc425.tar
forums-379900b4eda527d91c2e3252db5e3b89038bc425.tar.gz
forums-379900b4eda527d91c2e3252db5e3b89038bc425.tar.bz2
forums-379900b4eda527d91c2e3252db5e3b89038bc425.tar.xz
forums-379900b4eda527d91c2e3252db5e3b89038bc425.zip
Merge pull request #2 from phpbb/3.2.x
3.2.x
Diffstat (limited to 'phpBB/phpbb/event')
-rw-r--r--phpBB/phpbb/event/md_exporter.php11
1 files changed, 2 insertions, 9 deletions
diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php
index bec91d04f4..085b20c234 100644
--- a/phpBB/phpbb/event/md_exporter.php
+++ b/phpBB/phpbb/event/md_exporter.php
@@ -439,16 +439,9 @@ class md_exporter
$event_list = array();
$file_content = file_get_contents($this->path . $file);
- $events = explode('<!-- EVENT ', $file_content);
- // Remove the code before the first event
- array_shift($events);
- foreach ($events as $event)
- {
- $event = explode(' -->', $event, 2);
- $event_list[] = array_shift($event);
- }
+ preg_match_all('/(?:{%|<!--) EVENT (.*) (?:%}|-->)/U', $file_content, $event_list);
- return $event_list;
+ return $event_list[1];
}
/**