mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2019-07-21 21:38:31 +02:00
parent 627c8b75b1 348979c13d
commit 72dbba8592
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
phpBB/phpbb/event/md_exporter.php
View File

@@ -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;