Merge branch 'MDL-40806-m' of git://github.com/andrewnicols/moodle

diff --combined lib/outputrequirementslib.php
index 49551c0,fc9d1a0..25e2de2
--- 1/lib/outputrequirementslib.php
--- 2/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@@ -1657,6 -1657,7 +1657,7 @@@ class YUI_config 
          $cache = cache::make('core', 'yuimodules');
          if (!isset($CFG->jsrev) || $CFG->jsrev == -1) {
              $metadata = array();
+             $metadata = $this->get_moodle_metadata();
              $cache->delete('metadata');
          } else {
              // Attempt to get the metadata from the cache.
@@@ -1744,6 -1745,7 +1745,6 @@@
   */
  function js_reset_all_caches() {
      global $CFG;
 -    require_once("$CFG->libdir/filelib.php");
  
      $next = time();
      if (isset($CFG->jsrev) and $next <= $CFG->jsrev and $CFG->jsrev - $next < 60*60) {
@@@ -1754,4 -1756,5 +1755,4 @@@
      }
  
      set_config('jsrev', $next);
 -    fulldelete("$CFG->cachedir/js");
  }