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

Regression: Fixed enabling/disabling plugin or theme corrupting configuration

Browse Source
This commit is contained in:
Matias Griese
2021-02-19 22:04:04 +02:00
parent 233c7db74f
commit b7271bc424
3 changed files with 134 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
classes/plugin/AdminController.php
View File

@@ -158,7 +158,8 @@ class AdminController extends AdminBaseController
protected function taskSaveDefault()
{
// Handle standard data types.
$obj = $this->prepareData((array)$this->data);
$type = $this->getDataType();
$obj = $this->admin->getConfigurationData($type, $this->data);
try {
$obj->validate();
@@ -807,7 +808,7 @@ class AdminController extends AdminBaseController
$this->grav['themes']->get($name);
// Store system configuration.
$system = $this->admin->data('config/system');
$system = $this->admin->getConfigurationData('config/system');
$system->set('pages.theme', $name);
$system->save();
@@ -2686,6 +2687,14 @@ class AdminController extends AdminBaseController
return $settings + ['accept' => '*', 'limit' => 1000];
}
/**
* @return string
*/
protected function getDataType()
{
return trim("{$this->view}/{$this->admin->route}", '/');
}
/**
* Gets the configuration data for a given view & post
*
@@ -2694,7 +2703,7 @@ class AdminController extends AdminBaseController
*/
protected function prepareData(array $data)
{
$type = trim("{$this->view}/{$this->admin->route}", '/');
$type = $this->getDataType();
return $this->admin->data($type, $data);
}