From d9c73e2edbf6a6d913bb508570f353a5ae0baf1d Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Tue, 1 Dec 2020 09:51:43 +0200
Subject: [PATCH] Post merge conflicts

---
 admin.php                          |  1 +
 classes/Router.php                 | 31 ------------------------------
 classes/plugin/AdminController.php |  3 +--
 classes/plugin/Router.php          |  3 ++-
 4 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 classes/Router.php

diff --git a/admin.php b/admin.php
index 4b7555c8..a896e4e1 100644
--- a/admin.php
+++ b/admin.php
@@ -383,6 +383,7 @@ class AdminPlugin extends Plugin
                 // Create user object and save it
                 $user = $users->load($username);
                 $user->update($data);
+                $user->set('access', ['admin' => ['login' => true, 'super' => true], 'site' => ['login' => true]]);
                 $user->save();
 
                 // Login user
diff --git a/classes/Router.php b/classes/Router.php
deleted file mode 100644
index 8f483113..00000000
--- a/classes/Router.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Grav\Plugin\Admin;
-
-use Grav\Common\Processors\ProcessorBase;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class Router extends ProcessorBase
-{
-    public $id = 'admin_router';
-    public $title = 'Admin Panel';
-
-    /**
-     * Admin router.
-     *
-     * @param ServerRequestInterface $request
-     * @param RequestHandlerInterface $handler
-     * @return ResponseInterface
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
-    {
-        $this->startTimer();
-        $response = $handler->handle($request);
-        $this->stopTimer();
-
-        // Never allow admin pages to be rendered in <frame>, <iframe>, <embed> or <object> for improved security.
-        return $response->withHeader('X-Frame-Options', 'NONE');
-    }
-}
diff --git a/classes/plugin/AdminController.php b/classes/plugin/AdminController.php
index ab0182b2..93b97505 100644
--- a/classes/plugin/AdminController.php
+++ b/classes/plugin/AdminController.php
@@ -2536,11 +2536,10 @@ class AdminController extends AdminBaseController
         }
 
         $this->uri = $this->uri ?? $this->grav['uri'];
-        $this->grav['twig']->twig_vars['current_form_data'] = (array)$this->data;
 
         $field = (string)$this->uri->post('field', '');
         $order = $this->uri->post('order') ?: null;
-        if (!is_array($order)) {
+        if ($order && is_string($order)) {
             $order = array_map('trim', explode(',', $order));
         }
 
diff --git a/classes/plugin/Router.php b/classes/plugin/Router.php
index 9b359e0a..d1b5749c 100644
--- a/classes/plugin/Router.php
+++ b/classes/plugin/Router.php
@@ -53,6 +53,7 @@ class Router extends ProcessorBase
 
         $this->stopTimer();
 
-        return $response;
+        // Never allow admin pages to be rendered in <frame>, <iframe>, <embed> or <object> for improved security.
+        return $response->withHeader('X-Frame-Options', 'NONE');
     }
 }