Merge branch 'MDL-66836-m37' of https://github.com/sammarshallou/moodle into MOODLE_37_STABLE

2019-10-14 12:27:10 +02:00
parent 81bbf95756 3816bd8776
commit a9a9fd455a
2 changed files with 26 additions and 0 deletions
@@ -1411,6 +1411,14 @@ function set_config($name, $value, $plugin=null) {
                $config->value = $value;
                $DB->insert_record('config', $config, false);
            }
+            // When setting config during a Behat test (in the CLI script, not in the web browser
+            // requests), remember which ones are set so that we can clear them later.
+            if (defined('BEHAT_TEST')) {
+                if (!property_exists($CFG, 'behat_cli_added_config')) {
+                    $CFG->behat_cli_added_config = [];
+                }
+                $CFG->behat_cli_added_config[$name] = true;
+            }
        }
        if ($name === 'siteidentifier') {
            cache_helper::update_site_identifier($value);