makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2019-07-21 21:38:31 +02:00
commit 72dbba8592
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/docs/events.md
View file

@ -1740,14 +1740,14 @@ posting_attach_body_file_list_after
* Locations: * Locations:
+ styles/prosilver/template/posting_attach_body.html + styles/prosilver/template/posting_attach_body.html
* Since: 3.2.6-RC1 * Since: 3.2.6-RC1
* Purpose: Add content after attachments list * Purpose: Add content after attachments list
posting_attach_body_file_list_before posting_attach_body_file_list_before
=== ===
* Locations: * Locations:
+ styles/prosilver/template/posting_attach_body.html + styles/prosilver/template/posting_attach_body.html
* Since: 3.2.6-RC1 * Since: 3.2.6-RC1
* Purpose: Add content before attachments list * Purpose: Add content before attachments list
posting_editor_add_panel_tab posting_editor_add_panel_tab
=== ===
@ -2130,14 +2130,14 @@ search_results_header_before
search_results_last_post_author_username_append search_results_last_post_author_username_append
=== ===
* Locations: * Locations:
+ styles/prosilver/template/search_results.html + styles/prosilver/template/search_results.html (2)
* Since: 3.2.4-RC1 * Since: 3.2.4-RC1
* Purpose: Append information to last post author username of member * Purpose: Append information to last post author username of member
search_results_last_post_author_username_prepend search_results_last_post_author_username_prepend
=== ===
* Locations: * Locations:
+ styles/prosilver/template/search_results.html + styles/prosilver/template/search_results.html (2)
* Since: 3.2.4-RC1 * Since: 3.2.4-RC1
* Purpose: Prepend information to last post author username of member * Purpose: Prepend information to last post author username of member
@ -2654,14 +2654,14 @@ ucp_register_profile_fields_before
viewforum_body_last_post_author_username_append viewforum_body_last_post_author_username_append
=== ===
* Locations: * Locations:
+ styles/prosilver/template/viewforum_body.html + styles/prosilver/template/viewforum_body.html (2)
* Since: 3.2.4-RC1 * Since: 3.2.4-RC1
* Purpose: Append information to last post author username of member * Purpose: Append information to last post author username of member
viewforum_body_last_post_author_username_prepend viewforum_body_last_post_author_username_prepend
=== ===
* Locations: * Locations:
+ styles/prosilver/template/viewforum_body.html + styles/prosilver/template/viewforum_body.html (2)
* Since: 3.2.4-RC1 * Since: 3.2.4-RC1
* Purpose: Prepend information to last post author username of member * Purpose: Prepend information to last post author username of member

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

@ -389,9 +389,16 @@ class md_exporter
$files = explode("\n + ", $file_details); $files = explode("\n + ", $file_details);
foreach ($files as $file) 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') 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) if (($this->filter !== 'adm') && strpos($file, 'styles/prosilver/template/') === 0)
@ -404,7 +411,7 @@ class md_exporter
} }
else 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; $this->events_by_file[$file][] = $this->current_event;
@ -424,7 +431,7 @@ class md_exporter
} }
else 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; return $files_list;