Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-22 09:02:28 +01:00
Code Issues Releases Wiki Activity

Merge branch '1.0-develop' into develop

Browse Source
This commit is contained in:
Matthew Penner 2024-04-16 15:18:29 -06:00
commit 5bcf6fd459
No known key found for this signature in database
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SECURITY.md
View File

@ -6,7 +6,6 @@ The following versions of Pterodactyl are receiving active support and maintenan
| Panel | Daemon | Supported | | Panel | Daemon | Supported |
|--------|--------------|--------------------| |--------|--------------|--------------------|
| 1.10.x | wings@1.7.x | :white_check_mark: |
| 1.11.x | wings@1.11.x | :white_check_mark: | | 1.11.x | wings@1.11.x | :white_check_mark: |
| 0.7.x | daemon@0.6.x | :x: | | 0.7.x | daemon@0.6.x | :x: |

4
app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php
View File

@ -34,8 +34,8 @@ class BackupStatusController extends Controller
/** @var \Pterodactyl\Models\Node $node */ /** @var \Pterodactyl\Models\Node $node */
$node = $request->attributes->get('node'); $node = $request->attributes->get('node');
/** @var \Pterodactyl\Models\Backup $backup */ /** @var \Pterodactyl\Models\Backup $model */
$backup = Backup::query() $model = Backup::query()
->where('node_id', $node->id) ->where('node_id', $node->id)
->where('uuid', $backup) ->where('uuid', $backup)
->firstOrFail(); ->firstOrFail();