Merge branch 'wip-files23-fixes' of git://github.com/marinaglancy/moodle

[moodle.git] / lib / filelib.php

diff --git a/lib/filelib.php b/lib/filelib.php
index 9963485..dbc1133 100644 (file)
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -1591,7 +1591,7 @@ function mimeinfo_from_type($element, $mimetype) {
     $mimeinfo = & get_mimetypes_array();
 
     if (!array_key_exists($mimetype, $cached)) {
-        $cached[$mimetype] = null;    
+        $cached[$mimetype] = null;
         foreach($mimeinfo as $filetype => $values) {
             if ($values['type'] == $mimetype) {
                 if ($cached[$mimetype] === null) {
@@ -4214,7 +4214,6 @@ class cache_file {
      * @return string cached file path
      */
     public static function create_from_url($ref, $url, $options = array()) {
-        global $CFG;
         $instance = self::get_instance($options);
         $cachedfilepath = $instance->generate_filepath($ref);
         $fp = fopen($cachedfilepath, 'w');
@@ -4234,7 +4233,6 @@ class cache_file {
      * @return string cached file path
      */
     public static function create_from_string($ref, $string, $options = array()) {
-        global $CFG;
         $instance = self::get_instance($options);
         $cachedfilepath = $instance->generate_filepath($ref);
         $fp = fopen($cachedfilepath, 'w');