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

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

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	classes/adminbasecontroller.php
#	themes/grav/js/admin.min.js
This commit is contained in:
Matias Griese
2019-01-08 11:36:20 +02:00
parent 89a0b44d0a 9cc004f188
commit d08e4bfd4f
3 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classes/admin.php
View File

@@ -1403,9 +1403,9 @@ class Admin
return $found_fields;
}
public function getPagePathFromToken($path)
public function getPagePathFromToken($path, $page = null)
{
return Utils::getPagePathFromToken($path, $this->page(true));
return Utils::getPagePathFromToken($path, $page ?: $this->page(true));
}
/**