diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-04-12 20:46:41 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-04-12 20:46:41 +0200 |
| commit | 7a93730aab89b343113444beef1ff411f9102cfc (patch) | |
| tree | 37ff5e32026d0241c959c5d90133fbbe4df5c456 /phpBB/phpbb | |
| parent | cc7c1c8447496f1d34721442505481d7883668c2 (diff) | |
| parent | 728b5d2b442c3dda61998f305cf8c3b3bcf27547 (diff) | |
| download | forums-7a93730aab89b343113444beef1ff411f9102cfc.tar forums-7a93730aab89b343113444beef1ff411f9102cfc.tar.gz forums-7a93730aab89b343113444beef1ff411f9102cfc.tar.bz2 forums-7a93730aab89b343113444beef1ff411f9102cfc.tar.xz forums-7a93730aab89b343113444beef1ff411f9102cfc.zip | |
Merge pull request #5561 from marc1706/ticket/16010
[ticket/16010] Enforce alphabetical order for events in events.md
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/event/md_exporter.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php index 085b20c234..c3942bd7ce 100644 --- a/phpBB/phpbb/event/md_exporter.php +++ b/phpBB/phpbb/event/md_exporter.php @@ -143,6 +143,8 @@ class md_exporter list($event_name, $details) = explode("\n===\n", $event, 2); $this->validate_event_name($event_name); + $sorted_events = [$this->current_event, $event_name]; + natsort($sorted_events); $this->current_event = $event_name; if (isset($this->events[$this->current_event])) @@ -150,6 +152,12 @@ class md_exporter throw new \LogicException("The event '{$this->current_event}' is defined multiple times"); } + // Use array_values() to get actual first element and check against natural order + if (array_values($sorted_events)[0] === $event_name) + { + throw new \LogicException("The event '{$sorted_events[1]}' should be defined before '{$sorted_events[0]}'"); + } + if (($this->filter == 'adm' && strpos($this->current_event, 'acp_') !== 0) || ($this->filter == 'styles' && strpos($this->current_event, 'acp_') === 0)) { |