From dee5e6e07636db7e35a82919a723907e734fbcd1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Mar 2016 17:32:25 +0100
Subject: [PATCH] [ticket/14492] Add language variables for updating extensions
PHPBB3-14492
---
phpBB/language/en/acp/common.php | 1 +
phpBB/language/en/cli.php | 2 ++
.../module/update_database/task/update_extensions.php | 8 ++++----
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 5b747acd55..053671e1a2 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -819,4 +819,5 @@ $lang = array_merge($lang, array(
'LOG_EXT_ENABLE' => '<strong>Extension enabled</strong><br />» %s',
'LOG_EXT_DISABLE' => '<strong>Extension disabled</strong><br />» %s',
'LOG_EXT_PURGE' => '<strong>Extension’s data deleted</strong><br />» %s',
+ 'LOG_EXT_UPDATE' => '<strong>Extension updated</strong><br />» %s',
));
diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index db4b5f9ec6..09f46a5cee 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -104,6 +104,8 @@ $lang = array_merge($lang, array(
'CLI_EXTENSION_NAME' => 'Name of the extension',
'CLI_EXTENSION_PURGE_FAILURE' => 'Could not purge extension %s',
'CLI_EXTENSION_PURGE_SUCCESS' => 'Successfully purged extension %s',
+ 'CLI_EXTENSION_UPDATE_FAILURE' => 'Could not update extension %s',
+ 'CLI_EXTENSION_UPDATE_SUCCESS' => 'Successfully updated extension %s',
'CLI_EXTENSION_NOT_FOUND' => 'No extensions were found.',
'CLI_EXTENSIONS_AVAILABLE' => 'Available',
'CLI_EXTENSIONS_DISABLED' => 'Disabled',
diff --git a/phpBB/phpbb/install/module/update_database/task/update_extensions.php b/phpBB/phpbb/install/module/update_database/task/update_extensions.php
index 24b72f7b42..76904f80f1 100644
--- a/phpBB/phpbb/install/module/update_database/task/update_extensions.php
+++ b/phpBB/phpbb/install/module/update_database/task/update_extensions.php
@@ -174,11 +174,11 @@ class update_extensions extends task_base
if (isset($extensions[$ext_name]) && $extensions[$ext_name]['ext_active'])
{
// Create log
- $this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($ext_name));
- $this->iohandler->add_success_message(array('CLI_EXTENSION_ENABLE_SUCCESS', $ext_name));
+ $this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_UPDATE', time(), array($ext_name));
+ $this->iohandler->add_success_message(array('CLI_EXTENSION_UPDATE_SUCCESS', $ext_name));
} else
{
- $this->iohandler->add_log_message('CLI_EXTENSION_ENABLE_FAILURE', array($ext_name));
+ $this->iohandler->add_log_message('CLI_EXTENSION_UPDATE_FAILURE', array($ext_name));
}
// Disable extensions if it was disabled by the admin before
@@ -190,7 +190,7 @@ class update_extensions extends task_base
catch (\Exception $e)
{
// Add fail log and continue
- $this->iohandler->add_log_message('CLI_EXTENSION_ENABLE_FAILURE', array($ext_name));
+ $this->iohandler->add_log_message('CLI_EXTENSION_UPDATE_FAILURE', array($ext_name));
}
}