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

Merge branch '1.0-develop' into develop

Browse source
This commit is contained in:
Matthew Penner 2023-01-17 15:25:28 -07:00
commit 62238ad418
No known key found for this signature in database
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Console/Commands/Environment/EmailSettingsCommand.php
View file

@ -57,7 +57,7 @@ class EmailSettingsCommand extends Command
$this->{$method}();
}
$this->variables['MAIL_FROM'] = $this->option('email') ?? $this->ask(
$this->variables['MAIL_FROM_ADDRESS'] = $this->option('email') ?? $this->ask(
trans('command/messages.environment.mail.ask_mail_from'),
$this->config->get('mail.from.address')
);

3
app/Repositories/Wings/DaemonFileRepository.php
View file

@ -6,6 +6,7 @@ use Illuminate\Support\Arr;
use Webmozart\Assert\Assert;
use Pterodactyl\Models\Server;
use Psr\Http\Message\ResponseInterface;
use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\TransferException;
use Pterodactyl\Exceptions\Http\Server\FileSizeTooLargeException;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
@ -32,7 +33,7 @@ class DaemonFileRepository extends DaemonRepository
'query' => ['file' => $path],
]
);
} catch (TransferException $exception) {
} catch (ClientException|TransferException $exception) {
throw new DaemonConnectionException($exception);
}