diff --git a/phpBB/adm/style/acp_ext_delete.html b/phpBB/adm/style/acp_ext_delete.html
deleted file mode 100644
index f9a52861e5..0000000000
--- a/phpBB/adm/style/acp_ext_delete.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
{L_EXTENSIONS_ADMIN}
-
- {L_EXTENSIONS_EXPLAIN}
- {L_ENABLE_EXPLAIN}
-
-
- {L_DELETE_CONFIRM}
-
-
-
-
-
-
-
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index ef3bbb87cc..b3b1b84949 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -40,12 +40,11 @@
{disabled.EXT_NAME} |
{L_DETAILS} |
{L_ENABLE}
- | {L_PURGE}
- | {L_DELETE} |
+ | {L_PURGE}
-
+
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index ce32640c33..0e1d5c88a8 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -139,19 +139,6 @@ class acp_extensions
));
break;
- /*case 'delete_pre':
- $this->tpl_name = 'acp_ext_delete';
-
- $template->assign_vars(array(
- 'PRE' => true,
- 'U_DELETE' => $this->u_action . '&action=delete&ext_name=' . $ext_name,
- ));
- break;
-
- case 'delete':
- $this->tpl_name = 'acp_ext_delete';
- break;*/
-
case 'details':
// Output it to the template
$md_manager->output_template_data();
@@ -202,7 +189,6 @@ class acp_extensions
'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . $name,
'U_PURGE' => $this->u_action . '&action=purge_pre&ext_name=' . $name,
- //'U_DELETE' => $this->u_action . '&action=delete_pre&ext_name=' . $name,
'U_ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . $name,
));
}
@@ -227,7 +213,6 @@ class acp_extensions
'EXT_NAME' => $md_manager->get_metadata('display-name'),
'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . $name,
- //'U_DELETE' => $this->u_action . '&action=delete_pre&ext_name=' . $name,
'U_ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . $name,
));
}
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index a16e13d979..903ec249a8 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -48,13 +48,11 @@ $lang = array_merge($lang, array(
'ENABLED' => 'Enabled',
'DISABLED' => 'Disabled',
'PURGED' => 'Purged',
- 'DELETED' => 'Deleted',
'UPLOADED' => 'Uploaded',
'ENABLE' => 'Enable',
'DISABLE' => 'Disable',
'PURGE' => 'Purge',
- 'DELETE' => 'Delete',
'ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.',
'DISABLE_EXPLAIN' => 'Disabling an extension retains its files and settings but removes any functionality added by the extension.',
@@ -67,12 +65,10 @@ $lang = array_merge($lang, array(
'ENABLE_SUCCESS' => 'The extension was enabled successfully',
'DISABLE_SUCCESS' => 'The extension was disabled successfully',
'PURGE_SUCCESS' => 'The extension was purged successfully',
- 'DELETE_SUCCESS' => 'The extension was deleted successfully',
'ENABLE_FAIL' => 'The extension could not be enabled',
'DISABLE_FAIL' => 'The extension could not be disabled',
'PURGE_FAIL' => 'The extension could not be purged',
- 'DELETE_FAIL' => 'The extension could not be deleted',
'EXTENSION_NAME' => 'Extension Name',
'EXTENSION_ACTIONS' => 'Actions',
@@ -81,7 +77,6 @@ $lang = array_merge($lang, array(
'ENABLE_CONFIRM' => 'Are you sure that you wish to enable this extension?',
'DISABLE_CONFIRM' => 'Are you sure that you wish to disable this extension?',
'PURGE_CONFIRM' => 'Are you sure that you wish to purge this extension's data? This will remove all settings stored for this extension and cannot be undone!',
- 'DELETE_CONFIRM' => 'Are you sure that you wish to data this extension's files and clear its data? This cannot be undone.',
'WARNING' => 'Warning',
'RETURN' => 'Return',