Merge branch 'release/1.9.2'

CHANGELOG.md

@@ -1,3 +1,10 @@
+# v1.9.2
+## 04/15/2019
+
+1. [](#bugfix)
+    * Fix for homepage admin preview [#2426](https://github.com/getgrav/grav/issues/2426)
+    * Uploaded Avatar removed from user's yaml when editing the user [#1647](https://github.com/getgrav/grav-plugin-admin/issues/1647)
+
 # v1.9.1
 ## 04/13/2019
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Admin Panel
-version: 1.9.1
+version: 1.9.2
 testing: false
 description: Adds an advanced administration panel to manage your site
 icon: empire

classes/adminbasecontroller.php

@@ -764,6 +764,8 @@ class AdminBaseController
                     } else {
                         $obj->modifyHeader($init_key, $new_data);
                     }
+                } elseif ($obj instanceof UserInterface and $key === 'avatar') {
+                    $obj->set($key, $files);
                 } else {
                     // TODO: [this is JS handled] if it's single file, remove existing and use set, if it's multiple, use join
                     $obj->join($key, $files); // stores

classes/admincontroller.php

@@ -708,7 +708,6 @@ class AdminController extends AdminBaseController
         }
 
         $user->update($data->toArray());
-        $user->undef('avatar');
 
         $user = $this->storeFiles($user);
 

themes/grav/templates/preview.html.twig

@@ -1,6 +1,6 @@
 {% extends 'partials/base.html.twig' %}
 
-{% set route = admin.route == '' ? '' : '/' ~ admin.route %}
+{% set route = admin.route == '' ? '/' : '/' ~ admin.route %}
 {% set preview_link = base_url_relative_frontend|rtrim('/') ~ route %}
 {% set preview_html = (base_url|rtrim('/') ~ '/preview' ~ (context.home ? '' : context.route)) ?: '/' %}
 {% set admin_route = '/' ~ admin.route %}