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

Added support for user-uploadable avatar

Browse Source
This commit is contained in:
Andy Miller
2017-03-29 22:41:24 -07:00
parent 5d2f182fc0
commit 7af4d3b767
14 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/admincontroller.php
View File

@@ -489,7 +489,6 @@ class AdminController extends AdminBaseController
$parent = $route && $route != '/' && $route != '.' ? $pages->dispatch($route, true) : $pages->root();
$original_slug = $obj->slug();
$original_order = intval(trim($obj->order(), '.'));
// Change parent if needed and initialize move (might be needed also on ordering/folder change).
@@ -559,6 +558,7 @@ class AdminController extends AdminBaseController
if ($this->view === 'user') {
if ($obj->username == $this->grav['user']->username) {
//Editing current user. Reload user object
unset($this->grav['user']->avatar);
$this->grav['user']->merge(User::load($this->admin->route)->toArray());
}
}
@@ -1783,7 +1783,7 @@ class AdminController extends AdminBaseController
if (isset($input['folder']) && ($input['folder'] != $page->value('folder'))) {
if ($input['folder'] != $page->value('folder')) {
$order = $page->value('order');
$ordering = $order ? sprintf('%02d.', $order) : '';
$page->folder($ordering . $input['folder']);
@@ -1881,8 +1881,6 @@ class AdminController extends AdminBaseController
$order = $this->getNextOrderInFolder($page->parent()->path());
}
$this->preparePage($page);
// Make sure the header is loaded in case content was set through raw() (expert mode)
$page->header();