aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-10-10 13:55:56 +0200
committerMarc Alexander <admin@m-a-styles.de>2018-10-10 13:55:56 +0200
commit937c02966537a7745bf14ffa0134dc89bcf5484f (patch)
treee75d7c783ed0e351d64b53d10c6d0e4917b96b23
parent2225110c0d0e6e332386b998db9ba8e9b44eae2c (diff)
parentf3f1bfcbe8853093c4b557dae25b4a8fad12b97d (diff)
downloadforums-937c02966537a7745bf14ffa0134dc89bcf5484f.tar
forums-937c02966537a7745bf14ffa0134dc89bcf5484f.tar.gz
forums-937c02966537a7745bf14ffa0134dc89bcf5484f.tar.bz2
forums-937c02966537a7745bf14ffa0134dc89bcf5484f.tar.xz
forums-937c02966537a7745bf14ffa0134dc89bcf5484f.zip
Merge pull request #5386 from senky/ticket/15809
[ticket/15809] Allow twig syntax for template events
-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];
}
/**