interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to Kirby 3.3.2

Browse Source
This commit is contained in:
Bastian Allgeier
2019-12-17 10:31:21 +01:00
parent 3a82406bed
commit 91919964db
20 changed files with 361 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kirby/src/Toolkit/File.php
View File

@@ -72,11 +72,16 @@ class File
/**
* Returns the file as data uri
*
* @param bool $base64 Whether the data should be base64 encoded or not
* @return string
*/
public function dataUri(): string
public function dataUri(bool $base64 = true): string
{
return 'data:' . $this->mime() . ';base64,' . $this->base64();
if ($base64 === true) {
return 'data:' . $this->mime() . ';base64,' . $this->base64();
}
return 'data:' . $this->mime() . ',' . Escape::url($this->read());
}
/**

2
kirby/src/Toolkit/Mime.php
View File

@@ -31,7 +31,7 @@ class Mime
'avi' => 'video/x-msvideo',
'bmp' => 'image/bmp',
'css' => 'text/css',
'csv' => ['text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream'],
'csv' => ['text/csv', 'text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream'],
'doc' => 'application/msword',
'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',