Changeset 885 for trunk/Modules/File

Timestamp:

Sep 8, 2020, 5:57:23 PM (4 years ago)

Author:

chronos

Message:

• Fixed: MimeTypes for file download was not working as global variable with newer PHP 7.4.

Location:

trunk/Modules/File

Files:

• File.php (modified) (1 diff)
• MimeTypes.php (modified) (2 diffs)

trunk/Modules/File/File.php

@@ -43 +43 @@
   function DetectMimeType($FileName)
   {
-    global $MimeTypes;
-
-    $Result = $MimeTypes[pathinfo($FileName, PATHINFO_EXTENSION)][0];
+    $MimeTypes = GetMimeTypes();
+    $MimeType = pathinfo($FileName, PATHINFO_EXTENSION);
+    $Result = $MimeTypes[$MimeType][0];
     return $Result;
   }

trunk/Modules/File/MimeTypes.php

@@ -1 +1 @@
 <?php
 
-$MimeTypes = array(
+function GetMimeTypes()
+{
+  return array(
   '7z'    => array('application/x-7z-compressed'),
   'ai'    => array('application/postscript'),
@@ -123 +125 @@
   'xsl'   => array('text/xml'),
   'zip'   => array('application/x-zip', 'application/zip', 'application/x-zip-compressed')
-);
+  );
+}