mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-27 11:40:24 +02:00
Code Issues Releases Wiki Activity

Allow unsuspending from timed suspension

Browse Source 
Fixes flarum/core#1345.
This commit is contained in:
Franz Liedke
2018-02-08 22:33:09 +01:00
parent 333bb702ed
commit f22c792fe0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/suspend/src/Listener/SaveSuspensionToDatabase.php
View File

@@ -59,7 +59,9 @@ class SaveSuspensionToDatabase
$this->assertCan($actor, 'suspend', $user); $this->assertCan($actor, 'suspend', $user);
$user->suspend_until = new DateTime($attributes['suspendUntil']); $user->suspend_until = $attributes['suspendUntil']
? new DateTime($attributes['suspendUntil'])
: null;
} }
} }
} }

2
extensions/suspend/src/SuspendValidator.php
View File

@@ -19,6 +19,6 @@ class SuspendValidator extends AbstractValidator
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $rules = [ protected $rules = [
'suspendUntil' => ['date'], 'suspendUntil' => ['nullable', 'date'],
]; ];
} }