0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

System update (WOFF2 file format, thanks Richi)

Browse source
This commit is contained in:
markseu 2017-03-04 19:44:13 +01:00
parent db129d3774
commit 647a71257a
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
system/plugins/commandline.php
View file

@ -5,7 +5,7 @@
class YellowCommandline
{
const VERSION = "0.6.18";
const VERSION = "0.6.19";
var $yellow; //access to API
var $files; //number of files
var $errors; //number of errors
@ -409,7 +409,7 @@ class YellowCommandline
function getSystemLocations()
{
$locations = array();
$regex = "/\.(css|ico|js|jpg|png|svg|txt|woff)/";
$regex = "/\.(css|ico|js|jpg|png|svg|txt|woff|woff2)$/";
$pluginDirLength = strlenu($this->yellow->config->get("pluginDir"));
$fileNames = $this->yellow->toolbox->getDirectoryEntriesRecursive($this->yellow->config->get("pluginDir"), $regex, false, false);
foreach($fileNames as $fileName)

3
system/plugins/core.php
View file

@ -2373,7 +2373,7 @@ class YellowLookup
// Return file path for system location
function findFileFromSystem($location)
{
if(preg_match("/\.(css|ico|js|jpg|png|svg|txt|woff)$/", $location))
if(preg_match("/\.(css|ico|js|jpg|png|svg|txt|woff|woff2)$/", $location))
{
$pluginLocationLength = strlenu($this->yellow->config->get("pluginLocation"));
$themeLocationLength = strlenu($this->yellow->config->get("themeLocation"));
@ -2906,6 +2906,7 @@ class YellowToolbox
"svg" => "image/svg+xml",
"txt" => "text/plain",
"woff" => "application/font-woff",
"woff2" => "application/font-woff2",
"xml" => "text/xml; charset=utf-8");
$contentType = "";
$extension = $this->getFileExtension($fileName);