diff --git a/CHANGELOG.md b/CHANGELOG.md index 277da8ff..bc688a56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.5.4 +## mm/dd/2017 + +1. [](#bugfix) + * Fixed administration being broken in multi-site environments with plugin overrides + # v1.5.3 ## 08/18/2017 diff --git a/admin.php b/admin.php index 5f0dd4cc..e99e5ff7 100644 --- a/admin.php +++ b/admin.php @@ -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