Laravel fixes (#5451)

Laravel fixes
ppy · Dec 23, 2019 · b24b6a0 · b24b6a0
2 parents e481578 + 977bc5d
commit b24b6a0
Show file tree

Hide file tree

Showing 4 changed files with 219 additions and 197 deletions.
diff --git a/app/helpers.php b/app/helpers.php
@@ -717,6 +717,10 @@ function post_url($topicId, $postId, $jumpHash = true, $tail = false)
         $postIdParamKey = 'end';
     }
 
+    if ($topicId === null) {
+        return;
+    }
+
     $url = route('forum.topics.show', ['topic' => $topicId, $postIdParamKey => $postId]);
 
     return $url;

diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     "guzzlehttp/guzzle": "*",
     "itsgoingd/clockwork": ">=3.0",
     "jenssegers/agent": "*",
-    "laravel/framework": "6.*",
+    "laravel/framework": "6.8.0",
     "laravel/helpers": "^1.1",
     "laravel/passport": "*",
     "laravel/slack-notification-channel": "^2.0",