From 0a1ec11a0a4e47f8639b6f89949a4b369ea37a30 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 19 Sep 2019 12:55:46 -0600 Subject: [PATCH] Fix for deleting user avatar (regular users) --- CHANGELOG.md | 1 + classes/plugin/AdminBaseController.php | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba7c1c4e..15d3ce44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ 1. [](#bugfix) * Fixed missing language for AJAX requests * Fixed redirect with absolute language URL + * Fixed issue with user avatar reference not being deleted when image removed # v1.10.0-beta.7 ## 08/30/2019 diff --git a/classes/plugin/AdminBaseController.php b/classes/plugin/AdminBaseController.php index afec6322..5d562aac 100644 --- a/classes/plugin/AdminBaseController.php +++ b/classes/plugin/AdminBaseController.php @@ -971,10 +971,10 @@ class AdminBaseController $this->taskRemoveMedia($destination . '/' . $filename); if ($page) { - $keys = explode('.', preg_replace('/^header./', '', $field)); - $header = (array)$page->header(); + $keys = explode('.', preg_replace('/^header./', '', $field)); + $header = (array)$page->header(); $data_path = implode('.', $keys); - $data = Utils::getDotNotation($header, $data_path); + $data = Utils::getDotNotation($header, $data_path); if (isset($data[$path])) { unset($data[$path]); @@ -983,6 +983,10 @@ class AdminBaseController } $page->save(); + } elseif ($type === 'user') { + $user = Grav::instance()['user']; + unset($user->avatar); + $user->save(); } else { $blueprint_prefix = $type === 'config' ? '' : $type . '.';