From ac19f245bfe37a252630dd1137b9bc6fbe1da0b9 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Tue, 11 Nov 2014 16:42:52 +0800 Subject: [PATCH] MDL-48174 core_lang: support for ->skiplangupgrade in lang cron task Similar to upgrade_language_pack(), update_langpacks_task should respect skiplangupgrade config. Also, this should be added to behat whitelist, so it can be disabled during on-sync period, when lang pack for master is not available. --- .../tool/langimport/classes/task/update_langpacks_task.php | 7 +++++++ lib/behat/lib.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/admin/tool/langimport/classes/task/update_langpacks_task.php b/admin/tool/langimport/classes/task/update_langpacks_task.php index 68b9e326d59..dfdcb5d41ba 100644 --- a/admin/tool/langimport/classes/task/update_langpacks_task.php +++ b/admin/tool/langimport/classes/task/update_langpacks_task.php @@ -45,6 +45,13 @@ class update_langpacks_task extends \core\task\scheduled_task { * Run langpack update */ public function execute() { + global $CFG; + + // No need to run upgrade, if skiplangupgrade is set. + if (!empty($CFG->skiplangupgrade)) { + return; + } + $controller = new \tool_langimport\controller(); if ($controller->update_all_installed_languages()) { foreach ($controller->info as $message) { diff --git a/lib/behat/lib.php b/lib/behat/lib.php index 7cc7761a3ff..e32bbb52465 100644 --- a/lib/behat/lib.php +++ b/lib/behat/lib.php @@ -155,7 +155,7 @@ function behat_clean_init_config() { 'wwwroot', 'dataroot', 'dirroot', 'admin', 'directorypermissions', 'filepermissions', 'umaskpermissions', 'dbtype', 'dblibrary', 'dbhost', 'dbname', 'dbuser', 'dbpass', 'prefix', 'dboptions', 'proxyhost', 'proxyport', 'proxytype', 'proxyuser', 'proxypassword', - 'proxybypass', 'theme', 'pathtogs', 'pathtoclam', 'pathtodu', 'aspellpath', 'pathtodot' + 'proxybypass', 'theme', 'pathtogs', 'pathtoclam', 'pathtodu', 'aspellpath', 'pathtodot', 'skiplangupgrade' )); // Add extra allowed settings.