diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index f0133bc648..1fb2d2df26 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -92,19 +92,16 @@ class acp_extensions
case 'enable_pre':
if (!$md_manager->validate_dir())
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_ENABLE_DIR_INVALID_ERROR', time(), array($ext_name));
trigger_error($user->lang['EXTENSION_DIR_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
}
if (!$md_manager->validate_enable())
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_ENABLE_NOT_AVAILABLE_ERROR', time(), array($ext_name));
trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
}
if ($phpbb_extension_manager->enabled($ext_name))
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_ENABLE_ALREADY_ENABLED_ERROR', time(), array($ext_name));
redirect($this->u_action);
}
@@ -120,19 +117,16 @@ class acp_extensions
case 'enable':
if (!$md_manager->validate_dir())
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_ENABLE_DIR_INVALID_ERROR', time(), array($ext_name));
trigger_error($user->lang['EXTENSION_DIR_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
}
if (!$md_manager->validate_enable())
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_ENABLE_NOT_AVAILABLE_ERROR', time(), array($ext_name));
trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
}
if ($phpbb_extension_manager->enabled($ext_name))
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_ENABLE_ALREADY_ENABLED_ERROR', time(), array($ext_name));
redirect($this->u_action);
}
@@ -152,7 +146,6 @@ class acp_extensions
}
catch (\phpbb\db\migration\exception $e)
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_ENABLE_MIGRATION_ERROR', time(), array($ext_name));
$template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($user));
}
@@ -166,7 +159,6 @@ class acp_extensions
case 'disable_pre':
if (!$phpbb_extension_manager->enabled($ext_name))
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_DISABLE_NOT_ENABLED_ERROR', time(), array($ext_name));
redirect($this->u_action);
}
@@ -182,7 +174,6 @@ class acp_extensions
case 'disable':
if (!$phpbb_extension_manager->enabled($ext_name))
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_DISABLE_NOT_ENABLED_ERROR', time(), array($ext_name));
redirect($this->u_action);
}
@@ -208,7 +199,6 @@ class acp_extensions
case 'delete_data_pre':
if ($phpbb_extension_manager->enabled($ext_name))
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_PURGE_ENABLED_ERROR', time(), array($ext_name));
redirect($this->u_action);
}
$this->tpl_name = 'acp_ext_delete_data';
@@ -223,7 +213,6 @@ class acp_extensions
case 'delete_data':
if ($phpbb_extension_manager->enabled($ext_name))
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_PURGE_ENABLED_ERROR', time(), array($ext_name));
redirect($this->u_action);
}
@@ -243,7 +232,6 @@ class acp_extensions
}
catch (\phpbb\db\migration\exception $e)
{
- $this->log->add('critical', $user->data['user_id'], $user->ip, 'LOG_EXT_PURGE_MIGRATION_ERROR', time(), array($ext_name));
$template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($user));
}
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 2896ab4e36..8014ee64f1 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -780,19 +780,5 @@ $lang = array_merge($lang, array(
'LOG_EXT_ENABLE' => 'Extension enabled
» %s',
'LOG_EXT_DISABLE' => 'Extension disabled
» %s',
- 'LOG_EXT_PURGE' => 'Extension’s data deleted
» %s',
-
- 'LOG_EXT_ENABLE_ERROR' => 'Error while enabling an extension
» %s',
- 'LOG_EXT_DISABLE_ERROR' => 'Error while disabling an extension
» %s',
- 'LOG_EXT_PURGE_ERROR' => 'Error while deleted the data of an extension
» %s',
-
- 'LOG_EXT_ENABLE_DIR_INVALID_ERROR' => 'Error while enabling the extension "%s"
» Invalid directory structure.',
- 'LOG_EXT_ENABLE_NOT_AVAILABLE_ERROR' => 'Error while enabling the extension "%s"
» Extension unavailable for this board.',
- 'LOG_EXT_ENABLE_ALREADY_ENABLED_ERROR' => 'Error while enabling the extension "%s"
» Extension already enabled.',
- 'LOG_EXT_ENABLE_MIGRATION_ERROR' => 'Error while enabling the extension "%s"
» Migration error.',
-
- 'LOG_EXT_DISABLE_NOT_ENABLED_ERROR' => 'Error while disabling the extension "%s"
» Extension not enabled.',
-
- 'LOG_EXT_PURGE_ENABLED_ERROR' => 'Error while deleting the data of the extension "%s"
» Extension enabled.',
- 'LOG_EXT_PURGE_MIGRATION_ERROR' => 'Error while deleting the data of the extension "%s"
» Migration error.',
+ 'LOG_EXT_PURGE' => 'Extension’s data deleted
» %s',
));
diff --git a/phpBB/phpbb/console/command/extension/disable.php b/phpBB/phpbb/console/command/extension/disable.php
index fb0c23762f..ceaf168108 100644
--- a/phpBB/phpbb/console/command/extension/disable.php
+++ b/phpBB/phpbb/console/command/extension/disable.php
@@ -35,7 +35,6 @@ class disable extends command
if ($this->manager->enabled($name))
{
- $this->log->add('critical', ANONYMOUS, '', 'LOG_EXT_DISABLE_ERROR', time(), array($name));
$output->writeln("Could not disable extension $name");
return 1;
}
diff --git a/phpBB/phpbb/console/command/extension/enable.php b/phpBB/phpbb/console/command/extension/enable.php
index e20a5ba81d..757f19005e 100644
--- a/phpBB/phpbb/console/command/extension/enable.php
+++ b/phpBB/phpbb/console/command/extension/enable.php
@@ -41,7 +41,6 @@ class enable extends command
}
else
{
- $this->log->add('critical', ANONYMOUS, '', 'LOG_EXT_ENABLE_ERROR', time(), array($name));
$output->writeln("Could not enable extension $name");
return 1;
}
diff --git a/phpBB/phpbb/console/command/extension/purge.php b/phpBB/phpbb/console/command/extension/purge.php
index 234d32f302..0342d116f5 100644
--- a/phpBB/phpbb/console/command/extension/purge.php
+++ b/phpBB/phpbb/console/command/extension/purge.php
@@ -35,7 +35,6 @@ class purge extends command
if ($this->manager->enabled($name))
{
- $this->log->add('critical', ANONYMOUS, '', 'LOG_EXT_PURGE_ERROR', time(), array($name));
$output->writeln("Could not purge extension $name");
return 1;
}