diff options
author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-02 12:04:49 +0200 |
---|---|---|
committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-02 12:04:49 +0200 |
commit | 28da7581633059377f6f88e91e112d0c008501b8 (patch) | |
tree | f7e359e900f81c9d3f6e1caa6ea9ff124cfac090 | |
parent | 058c3116ed923a011cf983cb6da9fb4047a95f73 (diff) | |
parent | 58af8606c1f075ca34a2d6b307a55e598e9f4817 (diff) | |
download | forums-28da7581633059377f6f88e91e112d0c008501b8.tar forums-28da7581633059377f6f88e91e112d0c008501b8.tar.gz forums-28da7581633059377f6f88e91e112d0c008501b8.tar.bz2 forums-28da7581633059377f6f88e91e112d0c008501b8.tar.xz forums-28da7581633059377f6f88e91e112d0c008501b8.zip |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14075] Update version to 3.1.7-RC1
[ticket/14075] Add template event after poll preview panel
-rw-r--r-- | phpBB/docs/events.md | 7 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/posting_preview.html | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 4324ba178d..7203e7758e 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1121,6 +1121,13 @@ posting_poll_body_options_after * Since: 3.1.4-RC1 * Purpose: Add content after the poll options on creating a poll +posting_preview_poll_after +=== +* Locations: + + styles/prosilver/template/posting_preview.html +* Since: 3.1.7-RC1 +* Purpose: Add content after the poll preview block + posting_topic_title_before === * Locations: diff --git a/phpBB/styles/prosilver/template/posting_preview.html b/phpBB/styles/prosilver/template/posting_preview.html index a5aae8c436..aac117c090 100644 --- a/phpBB/styles/prosilver/template/posting_preview.html +++ b/phpBB/styles/prosilver/template/posting_preview.html @@ -24,6 +24,8 @@ <!-- ENDIF --> +<!-- EVENT posting_preview_poll_after --> + <div class="postbody"> <h3>{L_PREVIEW}{L_COLON} {PREVIEW_SUBJECT}</h3> |