Revert "Merge branch 'wip_MDL-46660_m28_memcache' of https://github.c…

…om/skodak/moodle"

This reverts commit 57fdca8, reversing
changes made to 62e30bf.

cache/stores/memcache/lang/en/cachestore_memcache.php

@@ -33,8 +33,6 @@
 
 When this setting is enabled, the server listed above will be used for fetching.';
 $string['clusteredheader'] = 'Split servers';
-$string['memcacheversioncheck'] = 'memcache PHP extension';
-$string['memcacheversionwarning'] = 'The installed memcache extension {$a->version} is lower than the recommended version {$a->minversion}, upgrading to at least the minimum version will result in better performance when using memcache.';
 $string['pluginname'] = 'Memcache';
 $string['prefix'] = 'Key prefix';
 $string['prefix_help'] = 'This prefix is used for all key names on the memcache server.
@@ -69,4 +67,4 @@
 $string['sessionhandlerconflict'] = 'Warning: A memcache instance ({$a}) has being configured to use the same memcached server as sessions. Purging all caches will lead to sessions also being purged.';
 $string['testservers'] = 'Test servers';
 $string['testservers_desc'] = 'The test servers get used for unit tests and for performance tests. It is entirely optional to set up test servers. Servers should be defined one per line and consist of a server address and optionally a port and weight.
-If no port is provided then the default port (11211) is used.';
+If no port is provided then the default port (11211) is used.';

cache/stores/memcache/settings.php

@@ -26,22 +26,8 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-if ($ADMIN->fulltree) {
-    $settings->add(new admin_setting_configtextarea(
+$settings->add(new admin_setting_configtextarea(
         'cachestore_memcache/testservers',
         new lang_string('testservers', 'cachestore_memcache'),
         new lang_string('testservers_desc', 'cachestore_memcache'),
         '', PARAM_RAW, 60, 3));
-
-    // This is an ugly hack, but the env page skips the warning if server not set...
-    require_once("$CFG->libdir/environmentlib.php");
-    $result = new environment_results('custom_check');
-    $result = cachestore_memcache_environment_check::check_memcache_version($result);
-    if ($result and $feedbackstr = $result->getFeedbackStr()) {
-        $settings->add(new admin_setting_heading(
-            'cachestoremucwarning',
-            new lang_string('warning'),
-            $result->strToReport($feedbackstr, 'statuswarning')));
-    }
-    unset($result);
-}

cache/stores/memcache/version.php

@@ -26,6 +26,6 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2014080400;    // The current module version (Date: YYYYMMDDXX)
+$plugin->version = 2014051200;    // The current module version (Date: YYYYMMDDXX)
 $plugin->requires = 2014050800;    // Requires this Moodle version.
 $plugin->component = 'cachestore_memcache';  // Full name of the plugin.