mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

Merge branch 'prep-release-3.3.14' into 3.3.x

Browse Source
This commit is contained in:
Marc Alexander
2024-11-10 10:46:19 +01:00
parent 725cbd31c8 bf83c73a60
commit 65e457d3d2
5 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/adm/style/acp_ext_list.html
View File

@@ -42,7 +42,7 @@
</tr>
</thead>
<tbody>
{% for list in ['enabled', 'disabled', 'available'] %}
{% for list in ['enabled', 'disabled', 'not_installed'] %}
{% set blockname = attribute(loops, list) %}
{% if blockname|length %}
<tr>
@@ -51,8 +51,8 @@
{% EVENT acp_ext_list_enabled_title_after %}
{% elseif list == 'disabled' %}
{% EVENT acp_ext_list_disabled_title_after %}
{% elseif list == 'available' %}
{% EVENT acp_ext_list_available_title_after %}
{% elseif list == 'not_installed' %}
{% EVENT acp_ext_list_not_installed_title_after %}
{% endif %}
</td>
</tr>
@@ -63,8 +63,8 @@
{% EVENT acp_ext_list_enabled_name_after %}
{% elseif list == 'disabled' %}
{% EVENT acp_ext_list_disabled_name_after %}
{% elseif list == 'available' %}
{% EVENT acp_ext_list_available_name_after %}
{% elseif list == 'not_installed' %}
{% EVENT acp_ext_list_not_installed_name_after %}
{% endif %}
</td>
<td style="text-align: center;">

26
phpBB/docs/events.md
View File

@@ -70,18 +70,6 @@ acp_ext_details_notice
* Since: 3.1.11-RC1
* Purpose: Add extension detail notices after version check information.
acp_ext_list_available_name_after
===
* Location: adm/style/acp_ext_list.html
* Since: 3.3.14-RC1
* Purpose: Add content after the name of available extensions in the list
acp_ext_list_available_title_after
===
* Location: adm/style/acp_ext_list.html
* Since: 3.3.14-RC1
* Purpose: Add text after available extensions section title.
acp_ext_list_disabled_name_after
===
* Location: adm/style/acp_ext_list.html
@@ -106,6 +94,20 @@ acp_ext_list_enabled_title_after
* Since: 3.1.11-RC1
* Purpose: Add text after enabled extensions section title.
acp_ext_list_not_installed_name_after
===
* Location: adm/style/acp_ext_list.html
* Since: 3.3.14-RC1
* Changed: 3.3.14 Renamed from acp_ext_list_available_name_after
* Purpose: Add content after the name of not installed extensions in the list
acp_ext_list_not_installed_title_after
===
* Location: adm/style/acp_ext_list.html
* Since: 3.3.14-RC1
* Changed: 3.3.14 Renamed from acp_ext_list_available_title_after
* Purpose: Add text after not installed extensions section title.
acp_forums_custom_settings
===
* Location: adm/style/acp_forums.html

6
phpBB/includes/acp/acp_extensions.php
View File

@@ -575,7 +575,7 @@ class acp_extensions
catch (exception_interface $e)
{
$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
$this->template->assign_block_vars('available', array(
$this->template->assign_block_vars('not_installed', array(
'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $message),
'S_VERSIONCHECK' => false,
));
@@ -589,9 +589,9 @@ class acp_extensions
$block_vars['NAME'] = $name;
$block_vars['U_DETAILS'] = $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name);
$this->template->assign_block_vars('available', $block_vars);
$this->template->assign_block_vars('not_installed', $block_vars);
$this->output_actions('available', array(
$this->output_actions('not_installed', array(
'ENABLE' => $this->u_action . '&amp;action=enable_pre&amp;ext_name=' . urlencode($name),
));
}

6
phpBB/language/en/acp/extensions.php
View File

@@ -47,9 +47,9 @@ $lang = array_merge($lang, array(
'DETAILS' => 'Details',
'EXTENSIONS_AVAILABLE' => 'Available Extensions',
'EXTENSIONS_DISABLED' => 'Disabled Extensions',
'EXTENSIONS_ENABLED' => 'Enabled Extensions',
'EXTENSIONS_NOT_INSTALLED' => 'Not installed Extensions',
'EXTENSIONS_DISABLED' => 'Disabled Extensions',
'EXTENSIONS_ENABLED' => 'Enabled Extensions',
'EXTENSION_DELETE_DATA' => 'Delete data',
'EXTENSION_DISABLE' => 'Disable',