From e3fc4ce6f8e4c94f42f6165163b6d815aa7f50f0 Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Wed, 13 Mar 2019 13:14:39 -0700 Subject: [PATCH] Proper fix for `vUndefined` when updating plugins/themes --- CHANGELOG.md | 1 + classes/admincontroller.php | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 291f31a7..93b5dd28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ 1. [](#bugfix) * Incorrect 2FA lang code [#1618](https://github.com/getgrav/grav-plugin-admin/issues/1618) * Fixed potential undefined property in `onPageNotFound` event handling + * Proper fix for `vUndefined` when updating plugins/themes # v1.9.0-rc.3 ## 02/18/2019 diff --git a/classes/admincontroller.php b/classes/admincontroller.php index 7762aefa..1acc4077 100644 --- a/classes/admincontroller.php +++ b/classes/admincontroller.php @@ -903,6 +903,16 @@ class AdminController extends AdminBaseController $gpm = new GravGPM($flush); $resources_updates = $gpm->getUpdatable(); + foreach ($resources_updates as $key => $update) { + if (!is_iterable($update)) { + continue; + } + + foreach ($update as $slug => $item) { + $resources_updates[$key][$slug] = $item->toArray(); + } + } + if ($gpm->grav !== null) { $grav_updates = [ 'isUpdatable' => $gpm->grav->isUpdatable(),