Merge branch 'wip-MDL-37474-m25' of git://github.com/samhemelryk/moodle

diff --combined cache/locallib.php
index cd4407c,70c061e..8a015ee
--- 1/cache/locallib.php
--- 2/cache/locallib.php
+++ b/cache/locallib.php
@@@ -401,11 -401,8 +401,11 @@@ class cache_config_writer extends cache
       * @param bool $coreonly If set to true only core definitions will be updated.
       */
      public static function update_definitions($coreonly = false) {
 -        $config = self::instance();
 +        $factory = cache_factory::instance();
 +        $factory->updating_started();
 +        $config = $factory->create_config_instance(true);
          $config->write_definitions_to_cache(self::locate_definitions($coreonly));
 +        $factory->updating_finished();
      }
  
      /**
@@@ -698,6 -695,10 +698,10 @@@ abstract class cache_administration_hel
                  array(
                      'text' => get_string('editmappings', 'cache'),
                      'url' => new moodle_url('/cache/admin.php', array('action' => 'editdefinitionmapping', 'sesskey' => sesskey()))
+                 ),
+                 array(
+                     'text' => get_string('purge', 'cache'),
+                     'url' => new moodle_url('/cache/admin.php', array('action' => 'purgedefinition', 'sesskey' => sesskey()))
                  )
              );
          }
@@@ -727,7 -728,7 +731,7 @@@
              }
              $actions[] = array(
                  'text' => get_string('purge', 'cache'),
-                 'url' => new moodle_url($baseurl, array('action' => 'purge'))
+                 'url' => new moodle_url($baseurl, array('action' => 'purgestore'))
              );
          }
          return $actions;