Merge #4356 branch 'Guisardo-fix-cors-woff2' into develop

* Guisardo-fix-cors-woff2:
  // CORE: Fix mime types for Woff
  // CORE: Added cors for woff2 file extension .htaccess FileMatch

classes/Tools.php

@@ -2440,9 +2440,10 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
         fwrite($write_fd, "AddType application/vnd.ms-fontobject .eot\n");
         fwrite($write_fd, "AddType font/ttf .ttf\n");
         fwrite($write_fd, "AddType font/otf .otf\n");
-        fwrite($write_fd, "AddType application/x-font-woff .woff\n");
+        fwrite($write_fd, "AddType application/font-woff .woff\n");
+        fwrite($write_fd, "AddType application/font-woff2 .woff2\n");
         fwrite($write_fd, "<IfModule mod_headers.c>
-    <FilesMatch \"\.(ttf|ttc|otf|eot|woff|svg)$\">
+    <FilesMatch \"\.(ttf|ttc|otf|eot|woff|woff2|svg)$\">
         Header add Access-Control-Allow-Origin \"*\"
     </FilesMatch>
 </IfModule>\n\n");
@@ -2462,6 +2463,7 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
     ExpiresByType image/svg+xml \"access plus 1 year\"
     ExpiresByType image/vnd.microsoft.icon \"access plus 1 year\"
     ExpiresByType application/font-woff \"access plus 1 year\"
+    ExpiresByType application/font-woff2 \"access plus 1 year\"
     ExpiresByType application/x-font-woff \"access plus 1 year\"
     ExpiresByType application/vnd.ms-fontobject \"access plus 1 year\"
     ExpiresByType font/opentype \"access plus 1 year\"