From 92de751154e737db6c1defdf99efb39f9b7945e4 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 29 Nov 2017 22:22:14 +1030
Subject: [PATCH] Fix last commit

---
 src/Forum/Controller/LogOutController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Forum/Controller/LogOutController.php b/src/Forum/Controller/LogOutController.php
index ce5517469..0d15c3340 100644
--- a/src/Forum/Controller/LogOutController.php
+++ b/src/Forum/Controller/LogOutController.php
@@ -105,6 +105,8 @@ class LogOutController implements ControllerInterface
         $csrfToken = $session->get('csrf_token');
 
         if (array_get($request->getQueryParams(), 'token') !== $csrfToken) {
+            $return = array_get($request->getQueryParams(), 'return');
+
             $view = $this->view->make('flarum.forum::log-out')
                 ->with('url', $this->url->toRoute('logout').'?token='.$csrfToken.($return ? '&return='.urlencode($return) : ''));