StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix known issues from the upgrade guide

Browse source
This commit is contained in:
Dane Everitt 2017-12-16 13:15:09 -06:00
parent 0dcf2aaed6
commit 3c48947f9d
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
11 changed files with 71 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Admin/PackController.php
View file

@ -163,7 +163,7 @@ class PackController extends Controller
*/
public function store(PackFormRequest $request)
{
if ($request->has('from_template')) {
if ($request->filled('from_template')) {
$pack = $this->templateUploadService->handle($request->input('egg_id'), $request->file('file_upload'));
} else {
$pack = $this->creationService->handle($request->normalize(), $request->file('file_upload'));

2
app/Http/Controllers/Admin/ServersController.php
View file

@ -524,7 +524,7 @@ class ServersController extends Controller
*/
public function delete(Request $request, Server $server)
{
$this->deletionService->withForce($request->has('force_delete'))->handle($server);
$this->deletionService->withForce($request->filled('force_delete'))->handle($server);
$this->alert->success(trans('admin/server.alerts.server_deleted'))->flash();
return redirect()->route('admin.servers');

5
app/Http/Controllers/Auth/LoginController.php
View file

@ -107,6 +107,8 @@ class LoginController extends Controller
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
*
* @throws \Illuminate\Validation\ValidationException
*/
public function login(Request $request)
{
@ -115,8 +117,7 @@ class LoginController extends Controller
if ($this->hasTooManyLoginAttempts($request)) {
$this->fireLockoutEvent($request);
return $this->sendLockoutResponse($request);
$this->sendLockoutResponse($request);
}
try {

2
app/Http/Middleware/VerifyReCaptcha.php
View file

@ -39,7 +39,7 @@ class VerifyReCaptcha
return $next($request);
}
if ($request->has('g-recaptcha-response')) {
if ($request->filled('g-recaptcha-response')) {
$client = new Client();
$res = $client->post($this->config->get('recaptcha.domain'), [
'form_params' => [

2
app/Http/Requests/Admin/DatabaseHostFormRequest.php
View file

@ -18,7 +18,7 @@ class DatabaseHostFormRequest extends AdminFormRequest
*/
public function rules()
{
if (! $this->has('node_id')) {
if (! $this->filled('node_id')) {
$this->merge(['node_id' => null]);
}