StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix empty server descriptions throwing SQL errors, closes #842

Browse source
This commit is contained in:
Dane Everitt 2018-01-01 12:23:45 -06:00
parent 4457634127
commit 958c29cfbf
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/Services/Servers/DetailsModificationService.php
View file

@ -95,9 +95,9 @@ class DetailsModificationService
$this->connection->beginTransaction();
$this->repository->withoutFresh()->update($server->id, [
'owner_id' => array_get($data, 'owner_id') ?? $server->owner_id,
'name' => array_get($data, 'name') ?? $server->name,
'description' => array_get($data, 'description') ?? $server->description,
'owner_id' => array_get($data, 'owner_id'),
'name' => array_get($data, 'name'),
'description' => array_get($data, 'description', ''),
], true, true);
if (array_get($data, 'owner_id') != $server->owner_id) {

3
app/Services/Servers/ServerCreationService.php
View file

@ -106,6 +106,7 @@ class ServerCreationService
* @throws \Pterodactyl\Exceptions\DisplayException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
* @throws \Illuminate\Validation\ValidationException
*/
public function create(array $data)
{
@ -117,7 +118,7 @@ class ServerCreationService
'uuidShort' => str_random(8),
'node_id' => array_get($data, 'node_id'),
'name' => array_get($data, 'name'),
'description' => array_get($data, 'description'),
'description' => array_get($data, 'description', ''),
'skip_scripts' => isset($data['skip_scripts']),
'suspended' => false,
'owner_id' => array_get($data, 'owner_id'),