Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix inability to assign services with no variables, closes #447

Browse source
This commit is contained in:
Dane Everitt 2017-05-22 18:43:49 -05:00
parent 3877aba373
commit 999411da29
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -3,6 +3,10 @@ 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. This project follows [Semantic Versioning](http://semver.org) guidelines.
## v0.6.1 (Courageous Carniadactylus)
### Fixed
* Fixes a bug preventing the use of services that have no variables attached to them.
## v0.6.0 (Courageous Carniadactylus) ## v0.6.0 (Courageous Carniadactylus)
### Fixed ### Fixed
* Bug causing error logs to be spammed if someone timed out on an ajax based page. * Bug causing error logs to be spammed if someone timed out on an ajax based page.

4
app/Repositories/ServerRepository.php
View file

@ -733,6 +733,10 @@ class ServerRepository
$i++; $i++;
} }
if ($parsed->count() === 0) {
return collect($merge);
}
return $parsed->merge($merge); return $parsed->merge($merge);
} }