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

Merge branch 'develop' of https://github.com/getgrav/grav-plugin-admin into develop

Browse Source
This commit is contained in:
Andy Miller
2017-08-31 12:46:56 -06:00
parent 4311b80eec 49a93e9897
commit fb24c95952
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -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 # v1.5.3
## 08/18/2017 ## 08/18/2017

2
admin.php
View File

@@ -499,7 +499,7 @@ class AdminPlugin extends Plugin
$twig->twig_vars['admin'] = $this->admin; $twig->twig_vars['admin'] = $this->admin;
$twig->twig_vars['admin_version'] = $this->version; $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 = $fa_icons_file->content();
$fa_icons = array_map(function ($icon) { $fa_icons = array_map(function ($icon) {
//only pick used values //only pick used values