From 1176ca8a503148dcc8658b9f0543736f0e9dd303 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 29 Dec 2017 21:29:04 +1030
Subject: [PATCH] Fix URL generator usage

---
 framework/core/src/Forum/Controller/LogOutController.php | 2 +-
 framework/core/views/reset-password.blade.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/core/src/Forum/Controller/LogOutController.php b/framework/core/src/Forum/Controller/LogOutController.php
index d3473a068..cc71a20af 100644
--- a/framework/core/src/Forum/Controller/LogOutController.php
+++ b/framework/core/src/Forum/Controller/LogOutController.php
@@ -108,7 +108,7 @@ class LogOutController implements ControllerInterface
             $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) : ''));
+                ->with('url', $this->url->to('forum')->route('logout').'?token='.$csrfToken.($return ? '&return='.urlencode($return) : ''));
 
             return new HtmlResponse($view->render());
         }
diff --git a/framework/core/views/reset-password.blade.php b/framework/core/views/reset-password.blade.php
index 11ac7020e..5c5a9d86b 100644
--- a/framework/core/views/reset-password.blade.php
+++ b/framework/core/views/reset-password.blade.php
@@ -14,7 +14,7 @@
     </div>
   @endif
 
-  <form class="form" method="POST" action="{{ $url->toRoute('savePassword') }}">
+  <form class="form" method="POST" action="{{ $url->to('forum')->route('savePassword') }}">
     <input type="hidden" name="csrfToken" value="{{ $csrfToken }}">
     <input type="hidden" name="passwordToken" value="{{ $passwordToken }}">