mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-21 16:51:34 +02:00
Code Issues Releases Wiki Activity

Don't write/serve empty asset files

Browse Source 
The new locale-specific CSS file doesn't have any content by default, so it's a waste to write it and serve it to the user.
This commit is contained in:
Toby Zerner
2016-05-26 22:24:56 +09:30
parent ed8a145348
commit fbe87416cf
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/core/src/Asset/RevisionCompiler.php
View File

@@ -90,10 +90,15 @@ class RevisionCompiler implements CompilerInterface
unlink($file); unlink($file);
} }
$file = $this->path.'/'.substr_replace($this->filename, '-'.$current, -strlen($ext) - 1, 0);
if ($this->files || $this->strings) {
$this->putRevision($current); $this->putRevision($current);
$file = $this->path.'/'.substr_replace($this->filename, '-'.$current, -strlen($ext) - 1, 0);
file_put_contents($file, $this->compile()); file_put_contents($file, $this->compile());
} else {
return null;
}
} }
return $file; return $file;

2
framework/core/src/Http/WebApp/WebAppView.php
View File

@@ -343,7 +343,7 @@ class WebAppView
{ {
return array_map(function ($file) use ($baseUrl) { return array_map(function ($file) use ($baseUrl) {
return $baseUrl.str_replace(public_path(), '', $file); return $baseUrl.str_replace(public_path(), '', $file);
}, $files); }, array_filter($files));
} }
/** /**