Merge branch 'develop' into feature/filemanager

This commit is contained in:
Dane Everitt 2016-10-03 13:19:02 -04:00
commit dbd2900f0f
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53

View file

@ -30,6 +30,7 @@ use Hash;
use Validator;
use Mail;
use Carbon;
use Auth;
use Pterodactyl\Models;
use Pterodactyl\Services\UuidService;
@ -152,6 +153,10 @@ class UserRepository
throw new DisplayException('Cannot delete a user with active servers attached to thier account.');
}
if(Auth::user()->id === $id) {
throw new DisplayException('Cannot delete your own account.');
}
DB::beginTransaction();
try {