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

Theme update - custom files overwritten #2135

Browse Source
This commit is contained in:
Matias Griese
2021-04-29 14:58:48 +03:00
parent ac4d1588f0
commit 9d21a98f61
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@
* Added a `min_height:` option for list field * Added a `min_height:` option for list field
1. [](#bugfix) 1. [](#bugfix)
* Fixed z-index issue for tooltips in sidebar * Fixed z-index issue for tooltips in sidebar
* Fixed custom files being overridden during theme update [#2135](https://github.com/getgrav/grav-plugin-admin/issues/2135)
# v1.10.13 # v1.10.13
## 04/23/2021 ## 04/23/2021

4
classes/plugin/AdminController.php
View File

@@ -993,7 +993,7 @@ class AdminController extends AdminBaseController
return false; return false;
} }
$result = Gpm::install(array_keys($dependencies), ['theme' => $type === 'theme']); $result = Gpm::install(array_keys($dependencies), ['theme' => $type === 'themes']);
if ($result) { if ($result) {
$this->admin->json_response = ['status' => 'success', 'message' => 'Dependencies installed successfully']; $this->admin->json_response = ['status' => 'success', 'message' => 'Dependencies installed successfully'];
@@ -1033,7 +1033,7 @@ class AdminController extends AdminBaseController
$data = $this->post; $data = $this->post;
$package = $data['package'] ?? ''; $package = $data['package'] ?? '';
try { try {
$result = Gpm::install($package, ['theme' => $type === 'theme']); $result = Gpm::install($package, ['theme' => $type === 'themes']);
} catch (\Exception $e) { } catch (\Exception $e) {
/** @var Debugger $debugger */ /** @var Debugger $debugger */
$debugger = $this->grav['debugger']; $debugger = $this->grav['debugger'];