resolve ternary always true

flarum · Jan 5, 2024 · 40dfb1f · 40dfb1f
1 parent 19168b6
commit 40dfb1f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/framework/core/src/Forum/Controller/LogOutController.php b/framework/core/src/Forum/Controller/LogOutController.php
@@ -93,8 +93,8 @@ public function handle(Request $request): ResponseInterface
         $actor = RequestUtil::getActor($request);
         $base = $this->url->to('forum')->base();
 
-        $rurl = (string) Arr::get($request->getQueryParams(), 'return');
-        $return = $this->sanitizeReturnUrl($rurl, $base);
+        $rurl = Arr::get($request->getQueryParams(), 'return');
+        $return = $this->sanitizeReturnUrl((string) $rurl, $base);
 
         // If there is no user logged in, return to the index or the return url if it's set.
         if ($actor->isGuest()) {
@@ -107,7 +107,7 @@ public function handle(Request $request): ResponseInterface
 
         if (Arr::get($request->getQueryParams(), 'token') !== $csrfToken) {
             $view = $this->view->make('flarum.forum::log-out')
-                ->with('url', $this->url->to('forum')->route('logout') . '?token=' . $csrfToken . ($return ? '&return=' . urlencode($return) : ''));
+                ->with('url', $this->url->to('forum')->route('logout') . '?token=' . $csrfToken . ($rurl ? '&return=' . urlencode($return) : ''));
 
             return new HtmlResponse($view->render());
         }