Fixed administration being broken in multi-site environments with plugin overrides

This commit is contained in:
Matias Griese
2017-08-30 19:09:06 +03:00
parent 7957381889
commit 49a93e9897
2 changed files with 7 additions and 1 deletions

View File

@@ -495,7 +495,7 @@ class AdminPlugin extends Plugin
$twig->twig_vars['admin'] = $this->admin;
$twig->twig_vars['admin_version'] = $this->version;
$fa_icons_file = CompiledYamlFile::instance($this->grav['locator']->findResource('plugin://admin/themes/grav/templates/forms/fields/iconpicker/icons' . YAML_EXT, true, true));
$fa_icons_file = CompiledYamlFile::instance($this->grav['locator']->findResource('plugin://admin/themes/grav/templates/forms/fields/iconpicker/icons' . YAML_EXT));
$fa_icons = $fa_icons_file->content();
$fa_icons = array_map(function ($icon) {
//only pick used values