diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-12-27 14:03:34 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-12-27 14:03:34 +0100 |
| commit | fbe0f0413243203c187e1c96e6c34dae051ea795 (patch) | |
| tree | 4067fe6ec824ce5d31af64fbb68ac88a7af0f879 | |
| parent | 228fda0f0336192ee57823899d54cf1dfcd89ecd (diff) | |
| parent | fa06c7967eb423589f2f7fd5202bf72faa2aeee0 (diff) | |
| download | forums-fbe0f0413243203c187e1c96e6c34dae051ea795.tar forums-fbe0f0413243203c187e1c96e6c34dae051ea795.tar.gz forums-fbe0f0413243203c187e1c96e6c34dae051ea795.tar.bz2 forums-fbe0f0413243203c187e1c96e6c34dae051ea795.tar.xz forums-fbe0f0413243203c187e1c96e6c34dae051ea795.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/overall_footer.html
| -rw-r--r-- | phpBB/docs/events.md | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 48083b2ce0..bc71b5b05f 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -594,6 +594,13 @@ overall_footer_after * Since: 3.1.0-a1 * Purpose: Add content at the end of the file, directly prior to the `</body>` tag +overall_footer_body_after +=== +* Locations: + + styles/prosilver/template/overall_footer.html +* Since: 3.1.3-RC1 +* Purpose: Add content before the `</body>` tag but after the $SCRIPTS var, i.e. after the js scripts have been loaded + overall_footer_breadcrumb_append === * Locations: diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 275859ac97..6f35d0e80b 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -48,5 +48,7 @@ <!-- IF S_PLUPLOAD --><!-- INCLUDE plupload.html --><!-- ENDIF --> {$SCRIPTS} +<!-- EVENT overall_footer_body_after --> + </body> </html> |