diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-07-21 21:38:23 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-07-21 21:38:23 +0200 |
| commit | 091e195717b8e455d0d8fd146e60b50a6633df17 (patch) | |
| tree | 74723e2f537bce0bd3a5674c8290149340f12f8e /phpBB/phpbb | |
| parent | 17c6cd3676fae4947d263fc2b80dde3a4e96f011 (diff) | |
| parent | f2489a4c002538a986580008f959f5450cbc0b2c (diff) | |
| download | forums-091e195717b8e455d0d8fd146e60b50a6633df17.tar forums-091e195717b8e455d0d8fd146e60b50a6633df17.tar.gz forums-091e195717b8e455d0d8fd146e60b50a6633df17.tar.bz2 forums-091e195717b8e455d0d8fd146e60b50a6633df17.tar.xz forums-091e195717b8e455d0d8fd146e60b50a6633df17.zip | |
Merge pull request #5571 from dark-1/ticket/16021
[ticket/16021] Recognize number of Template Event instances in events.md file
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/event/md_exporter.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php index c3942bd7ce..1a2d7c989e 100644 --- a/phpBB/phpbb/event/md_exporter.php +++ b/phpBB/phpbb/event/md_exporter.php @@ -389,9 +389,16 @@ class md_exporter $files = explode("\n + ", $file_details); foreach ($files as $file) { + if (!preg_match('#^([^ ]+)( \([0-9]+\))?$#', $file)) + { + throw new \LogicException("Invalid event instances for file '{$file}' found for event '{$this->current_event}'", 1); + } + + list($file) = explode(" ", $file); + if (!file_exists($this->path . $file) || substr($file, -5) !== '.html') { - throw new \LogicException("Invalid file '{$file}' not found for event '{$this->current_event}'", 1); + throw new \LogicException("Invalid file '{$file}' not found for event '{$this->current_event}'", 2); } if (($this->filter !== 'adm') && strpos($file, 'styles/prosilver/template/') === 0) @@ -404,7 +411,7 @@ class md_exporter } else { - throw new \LogicException("Invalid file '{$file}' not found for event '{$this->current_event}'", 2); + throw new \LogicException("Invalid file '{$file}' not found for event '{$this->current_event}'", 3); } $this->events_by_file[$file][] = $this->current_event; @@ -424,7 +431,7 @@ class md_exporter } else { - throw new \LogicException("Invalid file list found for event '{$this->current_event}'", 2); + throw new \LogicException("Invalid file list found for event '{$this->current_event}'", 1); } return $files_list; |