From 027eb38ed513ad3c6cf47997b7e0a59795bf3ed8 Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Tue, 19 Apr 2016 17:11:05 +0800
Subject: [PATCH] MDL-48506 cachestore_memcached: make warning more noticeable

---
 cache/stores/memcached/addinstanceform.php         | 14 ++++++++------
 .../memcached/lang/en/cachestore_memcached.php     |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cache/stores/memcached/addinstanceform.php b/cache/stores/memcached/addinstanceform.php
index e30c0bb1a6d..004063aedd4 100644
--- a/cache/stores/memcached/addinstanceform.php
+++ b/cache/stores/memcached/addinstanceform.php
@@ -41,10 +41,18 @@ class cachestore_memcached_addinstance_form extends cachestore_addinstance_form
      * Adds the desired form elements.
      */
     protected function configuration_definition() {
+        global $OUTPUT;
+
         $form = $this->_form;
         $version = phpversion('memcached');
         $hasrequiredversion = ($version || version_compare($version, cachestore_memcached::REQUIRED_VERSION, '>='));
 
+        if (!$hasrequiredversion) {
+            $notify = new \core\output\notification(nl2br(get_string('upgrade200recommended', 'cachestore_memcached')),
+                \core\output\notification::NOTIFY_WARNING);
+            $form->addElement('html', $OUTPUT->render($notify));
+        }
+
         $form->addElement('textarea', 'servers', get_string('servers', 'cachestore_memcached'), array('cols' => 75, 'rows' => 5));
         $form->addHelpButton('servers', 'servers', 'cachestore_memcached');
         $form->addRule('servers', get_string('required'), 'required');
@@ -97,12 +105,6 @@ class cachestore_memcached_addinstance_form extends cachestore_addinstance_form
         $form->addHelpButton('setservers', 'setservers', 'cachestore_memcached');
         $form->disabledIf('setservers', 'clustered');
         $form->setType('setservers', PARAM_RAW);
-
-        if (!$hasrequiredversion) {
-            $form->addElement('header', 'upgradenotice', get_string('notice', 'cachestore_memcached'));
-            $form->setExpanded('upgradenotice');
-            $form->addElement('html', nl2br(get_string('upgrade200recommended', 'cachestore_memcached')));
-        }
     }
 
     /**
diff --git a/cache/stores/memcached/lang/en/cachestore_memcached.php b/cache/stores/memcached/lang/en/cachestore_memcached.php
index d9b849f7297..fcfb2dcfab8 100644
--- a/cache/stores/memcached/lang/en/cachestore_memcached.php
+++ b/cache/stores/memcached/lang/en/cachestore_memcached.php
@@ -53,7 +53,6 @@ If the cache is shared by other applications then each key will be deleted indiv
 
 If you are running a dedicated cache for this application then the entire cache can safely be flushed without any risk of destroying another application's cache data. This should result in increased performance when purging the cache.
 ";
-$string['notice'] = 'Notice';
 $string['pluginname'] = 'Memcached';
 $string['prefix'] = 'Prefix key';
 $string['prefix_help'] = 'This can be used to create a "domain" for your item keys allowing you to create multiple memcached stores on a single memcached installation. It cannot be longer than 16 characters in order to ensure key length issues are not encountered.';