aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-11-12 17:14:39 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-11-12 17:14:39 +0100
commit4a1e5df654a31b9670df67ff9f72b209497f3e79 (patch)
treeeeb2f5cf14d1ab6aace991dbaefdfe25db196639
parentef77852aff1a58a5356d85e1a81c4ad46aa35e3e (diff)
parentc77798b1a3b71a7a10af9255ca2d829dc8cef5dc (diff)
downloadforums-4a1e5df654a31b9670df67ff9f72b209497f3e79.tar
forums-4a1e5df654a31b9670df67ff9f72b209497f3e79.tar.gz
forums-4a1e5df654a31b9670df67ff9f72b209497f3e79.tar.bz2
forums-4a1e5df654a31b9670df67ff9f72b209497f3e79.tar.xz
forums-4a1e5df654a31b9670df67ff9f72b209497f3e79.zip
Merge branch '3.1.x' into 3.2.x
-rw-r--r--phpBB/adm/style/acp_ext_list.html4
-rw-r--r--phpBB/docs/events.md12
2 files changed, 14 insertions, 2 deletions
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 8feb12a423..ccc39ea76d 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -44,7 +44,7 @@
<tbody>
<!-- IF .enabled -->
<tr>
- <td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
+ <td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong><!-- EVENT acp_ext_list_enabled_title_after --></td>
</tr>
<!-- BEGIN enabled -->
<tr class="ext_enabled row-highlight">
@@ -69,7 +69,7 @@
<!-- IF .disabled -->
<tr>
- <td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
+ <td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong><!-- EVENT acp_ext_list_disabled_title_after --></td>
</tr>
<!-- BEGIN disabled -->
<tr class="ext_disabled row-highlight">
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 39ef193f4d..a939c6ff7e 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -58,6 +58,18 @@ acp_email_options_after
* Since: 3.1.2-RC1
* Purpose: Add settings to mass email form
+acp_ext_list_disabled_title_after
+===
+* Location: adm/style/acp_ext_list.html
+* Since: 3.1.11-RC1
+* Purpose: Add text after disabled extensions section title.
+
+acp_ext_list_enabled_title_after
+===
+* Location: adm/style/acp_ext_list.html
+* Since: 3.1.11-RC1
+* Purpose: Add text after enabled extensions section title.
+
acp_forums_custom_settings
===
* Location: adm/style/acp_forums.html