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

Merge pull request #226 from hammerdawn/APICHANGE

Browse source 
Allow listing a user by both ID and email. Useful for checking if a u…
This commit is contained in:
Dane Everitt 2017-01-02 22:00:45 -05:00 committed by GitHub
commit 39731f99da
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/API/UserController.php
View file

@ -75,7 +75,7 @@ class UserController extends BaseController
*/ */
public function view(Request $request, $id) public function view(Request $request, $id)
{ {
$query = Models\User::where('id', $id); $query = Models\User::where((is_numeric($id) ? 'id' : 'email'), $id);
if (! is_null($request->input('fields'))) { if (! is_null($request->input('fields'))) {
foreach (explode(',', $request->input('fields')) as $field) { foreach (explode(',', $request->input('fields')) as $field) {