diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-27 22:10:27 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-27 22:10:27 +0100 |
| commit | 5d6f86800fb81eb20a81db3252e174ba155f12cb (patch) | |
| tree | 792a11cf4cab478549c558bf16182920905ec624 | |
| parent | f526e81ddff6dbf3c3fd2ebeda9928c553a64409 (diff) | |
| parent | a7b1b7192164c11262900267220860d7488657f6 (diff) | |
| download | forums-5d6f86800fb81eb20a81db3252e174ba155f12cb.tar forums-5d6f86800fb81eb20a81db3252e174ba155f12cb.tar.gz forums-5d6f86800fb81eb20a81db3252e174ba155f12cb.tar.bz2 forums-5d6f86800fb81eb20a81db3252e174ba155f12cb.tar.xz forums-5d6f86800fb81eb20a81db3252e174ba155f12cb.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/viewtopic_body.html
| -rw-r--r-- | phpBB/docs/events.md | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index ba92c0775c..19cdb808e6 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1301,6 +1301,13 @@ viewtopic_print_head_append * Since: 3.1.0-a1 * Purpose: Add asset calls directly before the `</head>` tag of the Print Topic screen +viewtopic_body_pagination_top_after +=== +* Locations: + + styles/prosilver/template/viewtopic_body.html +* Since: 3.1.4-RC1 +* Purpose: Add content after the pagination at top + viewtopic_body_avatar_after === * Locations: diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 3b2c0a9c65..d39645cbe2 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -64,7 +64,7 @@ <!-- ENDIF --> </div> <!-- ENDIF --> - + <!-- EVENT viewtopic_body_pagination_top_after --> </div> <!-- IF S_HAS_POLL --> |