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

Cleanup settings use in panel.

Browse Source
This commit is contained in:
Dane Everitt
2017-12-30 16:33:00 -06:00
parent 59b50ca75e
commit 1b9b92ac62
9 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Providers/AppServiceProvider.php
View File

@@ -30,6 +30,18 @@ class AppServiceProvider extends ServiceProvider
View::share('appIsGit', $this->versionData()['is_git'] ?? false);
}
/**
* Register application service providers.
*/
public function register()
{
// Only load the settings service provider if the environment
// is configured to allow it.
if (! config('pterodactyl.load_environment_only', false) && $this->app->environment() !== 'testing') {
$this->app->register(SettingsServiceProvider::class);
}
}
/**
* Return version information for the footer.
*

4
app/Providers/SettingsServiceProvider.php
View File

@@ -64,10 +64,6 @@ class SettingsServiceProvider extends ServiceProvider
*/
public function boot(ConfigRepository $config, Encrypter $encrypter, SettingsRepositoryInterface $settings)
{
if ($config->get('pterodactyl.load_environment_only', false)) {
return;
}
// Only set the email driver settings from the database if we
// are configured using SMTP as the driver.
if ($config->get('mail.driver') === 'smtp') {