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

Fixed admin_route() twig function to work properly with Grav 1.7.0-rc.4, which fixes Route base

Browse Source
This commit is contained in:
Matias Griese
2020-01-28 18:56:37 +02:00
parent d46200123c
commit 0e043aa0a9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -13,6 +13,7 @@
* Fixed saving data with empty field, default value (from config, plugin, theme) was used instead * Fixed saving data with empty field, default value (from config, plugin, theme) was used instead
* Fixed JS bug is using empty Grav URI param key * Fixed JS bug is using empty Grav URI param key
* Fixed bug in toggleable field being disabled with empty value (`''` `0`, `false`, `[]`...) * Fixed bug in toggleable field being disabled with empty value (`''` `0`, `false`, `[]`...)
* Fixed `admin_route()` twig function to work properly with Grav 1.7.0-rc.4, which fixes `Route` base
# v1.10.0-rc.3 # v1.10.0-rc.3
## 01/02/2020 ## 01/02/2020

4
classes/plugin/Admin.php
View File

@@ -314,13 +314,15 @@ class Admin
$languageCode = $languageCode ?? $language->getActive(); $languageCode = $languageCode ?? $language->getActive();
$languagePrefix = $languageCode ? '/' . $languageCode : ''; $languagePrefix = $languageCode ? '/' . $languageCode : '';
$root = $this->grav['uri']->rootUrl();
$parts = [ $parts = [
'path' => $path, 'path' => $path,
'query' => '', 'query' => '',
'query_params' => [], 'query_params' => [],
'grav' => [ 'grav' => [
// TODO: Make URL to be /admin/en, not /en/admin. // TODO: Make URL to be /admin/en, not /en/admin.
'root' => preg_replace('`//+`', '/', RouteFactory::getRoot() . $languagePrefix . $this->base), 'root' => preg_replace('`//+`', '/', $root . $languagePrefix . $this->base),
'language' => '', //$languageCode, 'language' => '', //$languageCode,
'route' => ltrim($path, '/'), 'route' => ltrim($path, '/'),
'params' => '' 'params' => ''