sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix environment_variables name (#1212)

This commit is contained in:
Sergzy 2018-06-30 22:25:40 +02:00 committed by Dane Everitt
parent ad9ed5ea00
commit bad9ae58e8
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* Hitting Ctrl+Z when editing a file on the web now works as expected. * Hitting Ctrl+Z when editing a file on the web now works as expected.
* Logo now links to the correct location on all pages. * Logo now links to the correct location on all pages.
* Permissions checking to determine if a user can see the task management page now works correctly. * Permissions checking to determine if a user can see the task management page now works correctly.
* Fixed `pterodactyl.environment_variables` to be used correctly for global environment variables. The wrong config variable name was being using previously.
### Changed ### Changed
* Attempting to upload a folder via the web file manager will now display a warning telling the user to use SFTP. * Attempting to upload a folder via the web file manager will now display a warning telling the user to use SFTP.

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

@ -78,7 +78,7 @@ class EnvironmentService
} }
// Process variables set in the configuration file. // Process variables set in the configuration file.
foreach ($this->config->get('pterodactyl.environment_mappings', []) as $key => $object) { foreach ($this->config->get('pterodactyl.environment_variables', []) as $key => $object) {
if (is_callable($object)) { if (is_callable($object)) {
$variables[$key] = call_user_func($object, $server); $variables[$key] = call_user_func($object, $server);
} else { } else {

2
tests/Unit/Services/Servers/EnvironmentServiceTest.php
View File

@ -12,7 +12,7 @@ use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
class EnvironmentServiceTest extends TestCase class EnvironmentServiceTest extends TestCase
{ {
const CONFIG_MAPPING = 'pterodactyl.environment_mappings'; const CONFIG_MAPPING = 'pterodactyl.environment_variables';
/** /**
* @var \Illuminate\Contracts\Config\Repository|\Mockery\Mock * @var \Illuminate\Contracts\Config\Repository|\Mockery\Mock