Merge branch '1.0-develop' into develop

pterodactyl · Apr 16, 2024 · 5bcf6fd · 5bcf6fd
2 parents 7f192dc + 6dc85c7
commit 5bcf6fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/SECURITY.md b/SECURITY.md
@@ -6,7 +6,6 @@ The following versions of Pterodactyl are receiving active support and maintenan
 
 | Panel  | Daemon       | Supported          |
 |--------|--------------|--------------------|
-| 1.10.x | wings@1.7.x  | :white_check_mark: |
 | 1.11.x | wings@1.11.x | :white_check_mark: |
 | 0.7.x  | daemon@0.6.x | :x:                |
 

diff --git a/app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php b/app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php
@@ -34,8 +34,8 @@ public function index(ReportBackupCompleteRequest $request, string $backup): Jso
         /** @var \Pterodactyl\Models\Node $node */
         $node = $request->attributes->get('node');
 
-        /** @var \Pterodactyl\Models\Backup $backup */
-        $backup = Backup::query()
+        /** @var \Pterodactyl\Models\Backup $model */
+        $model = Backup::query()
             ->where('node_id', $node->id)
             ->where('uuid', $backup)
             ->firstOrFail();