Merge d319502904 into 90ae588721

Signed-off-by: Matthew Penner <me@matthewp.io>

CHANGELOG.md

@@ -3,6 +3,16 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v1.11.10
+
+### BREAKING
+
+* Minimum PHP verion is now 8.2 due to Laravel upgrade!
+
+### Fixed
+
+* Update Laravel to address [CVE-2024-52301](https://github.com/advisories/GHSA-gv7v-rgg6-548h)
+
 ## v1.11.9
 
 ### Fixed

composer.json

@@ -28,7 +28,7 @@
         "guzzlehttp/guzzle": "~7.9.2",
         "hashids/hashids": "~5.0.2",
         "laracasts/utilities": "~3.2.3",
-        "laravel/framework": "~11.28.1",
+        "laravel/framework": "~11.31.0",
         "laravel/helpers": "~1.7.0",
         "laravel/sanctum": "~4.0.3",
         "laravel/tinker": "~2.10.0",

resources/views/partials/admin/settings/nav.blade.php

@@ -6,9 +6,9 @@
         <div class="col-xs-12">
             <div class="nav-tabs-custom nav-tabs-floating">
                 <ul class="nav nav-tabs">
-                    <li @if($activeTab === 'basic')class="active"@endif><a href="{{ route('admin.settings') }}">General</a></li>
-                    <li @if($activeTab === 'mail')class="active"@endif><a href="{{ route('admin.settings.mail') }}">Mail</a></li>
-                    <li @if($activeTab === 'advanced')class="active"@endif><a href="{{ route('admin.settings.advanced') }}">Advanced</a></li>
+                    <li @class(['active' => $activeTab === 'basic'])><a href="{{ route('admin.settings') }}">General</a></li>
+                    <li @class(['active' => $activeTab === 'mail'])><a href="{{ route('admin.settings.mail') }}">Mail</a></li>
+                    <li @class(['active' => $activeTab === 'advanced'])><a href="{{ route('admin.settings.advanced') }}">Advanced</a></li>
                 </ul>
             </div>
         </div>