Skip to content

Commit 999411d

Browse files
committed
Fix inability to assign services with no variables, closes pterodactyl#447
1 parent 3877aba commit 999411d

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ This file is a running track of new features and fixes to each version of the pa
33

44
This project follows [Semantic Versioning](http://semver.org) guidelines.
55

6+
## v0.6.1 (Courageous Carniadactylus)
7+
### Fixed
8+
* Fixes a bug preventing the use of services that have no variables attached to them.
9+
610
## v0.6.0 (Courageous Carniadactylus)
711
### Fixed
812
* Bug causing error logs to be spammed if someone timed out on an ajax based page.

app/Repositories/ServerRepository.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,10 @@ protected function parseVariables(Server $server)
733733
$i++;
734734
}
735735

736+
if ($parsed->count() === 0) {
737+
return collect($merge);
738+
}
739+
736740
return $parsed->merge($merge);
737741
}
738742

0 commit comments

Comments
 (0)