Merge branch 'wip-MDL-36859-m24' of git://github.com/samhemelryk/moodle

lang/en/cache.php

@@ -34,7 +34,6 @@ $string['area'] = 'Area';
 $string['caching'] = 'Caching';
 $string['cacheadmin'] = 'Cache administration';
 $string['cacheconfig'] = 'Configuration';
-$string['cachedef_config'] = 'Config settings';
 $string['cachedef_databasemeta'] = 'Database meta information';
 $string['cachedef_eventinvalidation'] = 'Event invalidation';
 $string['cachedef_locking'] = 'Locking';
@@ -118,4 +117,4 @@ $string['supports_keyawareness'] = 'key awareness';
 $string['tested'] = 'Tested';
 $string['testperformance'] = 'Test performance';
 $string['unsupportedmode'] = 'Unsupported mode';
-$string['untestable'] = 'Untestable';
+$string['untestable'] = 'Untestable';

lib/db/caches.php

@@ -51,18 +51,6 @@ $definitions = array(
         'persistentmaxsize' => 2
     ),
 
-    // Used to store data from the config + config_plugins table in the database.
-    // The key used is the component:
-    //   - core for all core config settings
-    //   - plugin component for all plugin settings.
-    // Persistence is used because normally several settings within a script.
-    'config' => array(
-        'mode' => cache_store::MODE_APPLICATION,
-        'persistent' => true,
-        'simplekeys' => true,
-        'simpledata' => true
-    ),
-
     // Event invalidation cache.
     // This cache is used to manage event invalidation, its keys are the event names.
     // Whenever something is invalidated it is both purged immediately and an event record created with the timestamp.