From 3f195ab7c8f93623d19a12194c0fe246ecb9fe59 Mon Sep 17 00:00:00 2001
From: John Okely <john@moodle.com>
Date: Thu, 25 Feb 2016 09:59:28 +0800
Subject: [PATCH 1/2] MDL-45104 logging: Fix spelling of writing

---
 admin/renderer.php | 4 ++--
 lang/en/moodle.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/renderer.php b/admin/renderer.php
index cdf1d8a18e0..261bdc89df2 100644
--- a/admin/renderer.php
+++ b/admin/renderer.php
@@ -287,7 +287,7 @@ class core_admin_renderer extends plugin_renderer_base {
 
         $output .= $this->header();
         $output .= $this->maturity_info($maturity);
-        $output .= $this->legacy_log_store_writting_error();
+        $output .= $this->legacy_log_store_writing_error();
         $output .= empty($CFG->disableupdatenotifications) ? $this->available_updates($availableupdates, $availableupdatesfetch) : '';
         $output .= $this->insecure_dataroot_warning($insecuredataroot);
         $output .= $this->display_errors_warning($errorsdisplayed);
@@ -1961,7 +1961,7 @@ class core_admin_renderer extends plugin_renderer_base {
      *
      * @return string An error message if writing to the legacy log store is enabled.
      */
-    protected function legacy_log_store_writting_error() {
+    protected function legacy_log_store_writing_error() {
         $enabled = get_config('logstore_legacy', 'loglegacy');
         if ($enabled) {
             return $this->warning(get_string('legacylogginginuse'));
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index fc66a831b80..2b5ecd9503e 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -1032,7 +1032,7 @@ $string['lastyear'] = 'Last year';
 $string['latestlanguagepack'] = 'Check for latest language pack on moodle.org';
 $string['layouttable'] = 'Layout table';
 $string['leavetokeep'] = 'Leave blank to keep current password';
-$string['legacylogginginuse'] = 'This site currently has writting to the legacy log store enabled. Writing to this log store is deprecated. Please write to a supported log store such as "standard" or "external".';
+$string['legacylogginginuse'] = 'This site currently has writing to the legacy log store enabled. Writing to this log store is deprecated. Please write to a supported log store such as "standard" or "external".';
 $string['legacythemeinuse'] = 'This site is being displayed to you in compatibility mode because your browser is too old.';
 $string['license'] = 'Licence';
 $string['licenses'] = 'Licences';

From a285d561ef6ef4aa521afa22d1fd4a5a0f9f85b9 Mon Sep 17 00:00:00 2001
From: John Okely <john@moodle.com>
Date: Thu, 25 Feb 2016 10:00:02 +0800
Subject: [PATCH 2/2] MDL-45104 logging: Check if legacy log is enabled

---
 admin/renderer.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/admin/renderer.php b/admin/renderer.php
index 261bdc89df2..7895c316c6e 100644
--- a/admin/renderer.php
+++ b/admin/renderer.php
@@ -1963,6 +1963,9 @@ class core_admin_renderer extends plugin_renderer_base {
      */
     protected function legacy_log_store_writing_error() {
         $enabled = get_config('logstore_legacy', 'loglegacy');
+        $plugins = explode(',', get_config('tool_log', 'enabled_stores'));
+        $enabled = $enabled && in_array('logstore_legacy', $plugins);
+
         if ($enabled) {
             return $this->warning(get_string('legacylogginginuse'));
         }