Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
This commit is contained in:
Marc Alexander 2015-09-12 13:24:29 +02:00
commit 087a42a887
2 changed files with 9 additions and 1 deletions

View file

@ -1128,6 +1128,14 @@ posting_preview_poll_after
* Since: 3.1.7-RC1
* Purpose: Add content after the poll preview block
posting_topic_title_after
===
* Locations:
+ styles/prosilver/template/posting_layout.html
+ styles/subsilver2/template/posting_body.html
* Since: 3.1.7-RC1
* Purpose: Allows to add some information after the topic title in the posting form
posting_topic_title_before
===
* Locations:

View file

@ -1,7 +1,7 @@
<!-- INCLUDE overall_header.html -->
<!-- IF TOPIC_TITLE -->
<h2 class="posting-title"><!-- EVENT posting_topic_title_before --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
<h2 class="posting-title"><!-- EVENT posting_topic_title_before --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT posting_topic_title_after --></h2>
<!-- ELSE -->
<h2 class="posting-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
<!-- ENDIF -->