Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-01 02:46:04 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' into 1.10

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	themes/grav/css-compiled/preset.css.map
#	themes/grav/css-compiled/template.css
#	themes/grav/css-compiled/template.css.map
#	themes/grav/templates/pages.html.twig
This commit is contained in:
Andy Miller
2019-10-23 15:25:38 -06:00
parent 41e376a7c7 c67be0e237
commit 55dda9d576
18 changed files with 136 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/plugin/AdminBaseController.php
View File

@@ -338,7 +338,7 @@ class AdminBaseController
}
$isMime = strstr($type, '/');
$find = str_replace(['.', '*'], ['\.', '.*'], $type);
$find = str_replace(['.', '*', '+'], ['\.', '.*', '\+'], $type);
if ($isMime) {
$match = preg_match('#' . $find . '$#', $mime);