mirror of
https://github.com/flarum/core.git
synced 2025-08-13 20:04:24 +02:00
Compare commits
2 Commits
dk/2836-tr
...
0.1.0-beta
Author | SHA1 | Date | |
---|---|---|---|
|
5bcf72dd49 | ||
|
0536b208e1 |
@@ -11,6 +11,8 @@
|
|||||||
|
|
||||||
namespace Flarum\Api\Controller;
|
namespace Flarum\Api\Controller;
|
||||||
|
|
||||||
|
use Flarum\Api\Serializer\CurrentUserSerializer;
|
||||||
|
use Flarum\Api\Serializer\UserSerializer;
|
||||||
use Flarum\Core\Command\EditUser;
|
use Flarum\Core\Command\EditUser;
|
||||||
use Flarum\Core\Exception\PermissionDeniedException;
|
use Flarum\Core\Exception\PermissionDeniedException;
|
||||||
use Illuminate\Contracts\Bus\Dispatcher;
|
use Illuminate\Contracts\Bus\Dispatcher;
|
||||||
@@ -22,7 +24,7 @@ class UpdateUserController extends AbstractResourceController
|
|||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
*/
|
*/
|
||||||
public $serializer = 'Flarum\Api\Serializer\CurrentUserSerializer';
|
public $serializer = UserSerializer::class;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
@@ -51,6 +53,10 @@ class UpdateUserController extends AbstractResourceController
|
|||||||
$actor = $request->getAttribute('actor');
|
$actor = $request->getAttribute('actor');
|
||||||
$data = array_get($request->getParsedBody(), 'data', []);
|
$data = array_get($request->getParsedBody(), 'data', []);
|
||||||
|
|
||||||
|
if ($actor->id == $id) {
|
||||||
|
$this->serializer = CurrentUserSerializer::class;
|
||||||
|
}
|
||||||
|
|
||||||
// Require the user's current password if they are attempting to change
|
// Require the user's current password if they are attempting to change
|
||||||
// their own email address.
|
// their own email address.
|
||||||
if (isset($data['attributes']['email']) && $actor->id == $id) {
|
if (isset($data['attributes']['email']) && $actor->id == $id) {
|
||||||
|
@@ -25,7 +25,7 @@ class Application extends Container implements ApplicationContract
|
|||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
const VERSION = '0.1.0-beta.7';
|
const VERSION = '0.1.0-beta.7.2';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The base path for the Flarum installation.
|
* The base path for the Flarum installation.
|
||||||
|
Reference in New Issue
Block a user