diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-08-16 12:24:46 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-08-16 12:24:46 +0200 |
| commit | 826cc9751a8956d275f5e8e894d3fe3d89f6004d (patch) | |
| tree | 443beede337e6fbd4e0c6d965a7f68da29d70104 /phpBB | |
| parent | f5f03d24e9ac04ac9f5ae5896ec04ccdc55ef38c (diff) | |
| parent | 2d8c5efbd26cecf00188c2e3d6d6235b820575a0 (diff) | |
| download | forums-826cc9751a8956d275f5e8e894d3fe3d89f6004d.tar forums-826cc9751a8956d275f5e8e894d3fe3d89f6004d.tar.gz forums-826cc9751a8956d275f5e8e894d3fe3d89f6004d.tar.bz2 forums-826cc9751a8956d275f5e8e894d3fe3d89f6004d.tar.xz forums-826cc9751a8956d275f5e8e894d3fe3d89f6004d.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/installer_footer.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html | 9 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_print.html | 9 |
3 files changed, 19 insertions, 3 deletions
diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html index fefa8f6d3f..54e6951a12 100644 --- a/phpBB/adm/style/installer_footer.html +++ b/phpBB/adm/style/installer_footer.html @@ -6,7 +6,9 @@ <div id="page-footer"> <div class="copyright"> - Powered by <a href="https://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Limited + {% if S_COPYRIGHT_HTML %} + {{ CREDIT_LINE }} + {% endif %} </div> </div> </div> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html index 7a8849258a..41ff5b898a 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html @@ -42,7 +42,14 @@ <div id="page-footer" class="page-footer"> <div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div> - <div class="copyright">Powered by phpBB® Forum Software © phpBB Limited<br />https://www.phpbb.com/</div> + <div class="copyright"> + <p>{{ CREDIT_LINE }} + </p> + {% if TRANSLATION_INFO %} + <p>{{ TRANSLATION_INFO }} + </p> + {% endif %} + </div> </div> </div> diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index b504949053..658062f9fd 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -38,7 +38,14 @@ <div id="page-footer" class="page-footer"> <div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div> - <div class="copyright">Powered by phpBB® Forum Software © phpBB Limited<br />https://www.phpbb.com/</div> + <div class="copyright"> + <p>{{ CREDIT_LINE }} + </p> + {% if TRANSLATION_INFO %} + <p>{{ TRANSLATION_INFO }} + </p> + {% endif %} + </div> </div> </div> |