MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-19 23:03:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into dane/restore-backups

Browse Source
This commit is contained in:
Dane Everitt
2021-01-30 10:10:29 -08:00
parent 0dd0f09238 8c2d1cdffc
commit be26921fcc
41 changed files with 440 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Servers/ServerConfigurationStructureService.php
View File

@@ -80,7 +80,7 @@ class ServerConfigurationStructureService
}),
'egg' => [
'id' => $server->egg->uuid,
'file_denylist' => explode(PHP_EOL, $server->egg->inherit_file_denylist),
'file_denylist' => $server->egg->inherit_file_denylist,
],
];
}

6
app/Services/Servers/ServerCreationService.php
View File

@@ -76,8 +76,8 @@ class ServerCreationService
* CreationService constructor.
*
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
* @param \Pterodactyl\Services\Servers\ServerDeletionService $serverDeletionService
* @param \Pterodactyl\Services\Servers\VariableValidatorService $validatorService
* @param \Pterodactyl\Services\Servers\ServerDeletionService $serverDeletionService
* @param \Pterodactyl\Services\Servers\VariableValidatorService $validatorService
*/
public function __construct(
AllocationSelectionService $allocationSelectionService,
@@ -258,7 +258,7 @@ class ServerCreationService
return [
'server_id' => $server->id,
'variable_id' => $result->id,
'variable_value' => $result->value,
'variable_value' => $result->value ?? '',
];
})->toArray();