Fix form requests

This commit is contained in:
Dane Everitt 2017-12-16 13:44:30 -06:00
parent c6cece51ee
commit 631b5eb1b2
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 2 additions and 12 deletions

View File

@ -44,9 +44,6 @@ abstract class AdminFormRequest extends FormRequest
*/
public function normalize($only = [])
{
return array_merge(
$this->only($only),
$this->intersect(array_keys($this->rules()))
);
return $this->all(empty($only) ? array_keys($this->rules()) : $only);
}
}

View File

@ -1,11 +1,4 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
*
* This software is licensed under the terms of the MIT license.
* https://opensource.org/licenses/MIT
*/
namespace Pterodactyl\Http\Requests\Admin;
@ -33,7 +26,7 @@ class UserFormRequest extends AdminFormRequest
{
if ($this->method === 'PATCH') {
return array_merge(
$this->intersect('password'),
$this->all(['password']),
$this->only(['email', 'username', 'name_first', 'name_last', 'root_admin', 'ignore_connection_error'])
);
}