Merge branch 'MDL-41071-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

cache/stores/file/lib.php

@@ -336,6 +336,7 @@ class cachestore_file extends cache_store implements cache_is_key_aware, cache_i
         $filename = $key.'.cache';
         $file = $this->file_path_for_key($key);
         $ttl = $this->definition->get_ttl();
+        $maxtime = 0;
         if ($ttl) {
             $maxtime = cache::now() - $ttl;
         }

lib/pluginlib.php

@@ -3301,7 +3301,7 @@ class plugininfo_mod extends plugininfo_base {
      */
     protected function load_version_php($disablecache=false) {
 
-        $cache = cache::make('core', 'plugininfo_base');
+        $cache = cache::make('core', 'plugininfo_mod');
 
         $versionsphp = $cache->get('versions_php');