mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-01 14:10:37 +02:00
Code Issues Releases Wiki Activity

Remove obsolete property accessor in User model

Browse Source 
The locale field does not exist, and the accessor code was broken.

Closes #1653.
This commit is contained in:
Franz Liedke
2018-11-22 21:12:25 +01:00
parent b68767abdd
commit 9b7957815f
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
framework/core/src/User/User.php
View File

@@ -18,7 +18,6 @@ use Flarum\Database\ScopeVisibilityTrait;
use Flarum\Event\ConfigureUserPreferences; use Flarum\Event\ConfigureUserPreferences;
use Flarum\Event\GetDisplayName; use Flarum\Event\GetDisplayName;
use Flarum\Event\PrepareUserGroups; use Flarum\Event\PrepareUserGroups;
use Flarum\Foundation\Application;
use Flarum\Foundation\EventGeneratorTrait; use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Group\Group; use Flarum\Group\Group;
use Flarum\Group\Permission; use Flarum\Group\Permission;
@@ -43,7 +42,6 @@ use Illuminate\Contracts\Session\Session;
* @property string $email * @property string $email
* @property bool $is_email_confirmed * @property bool $is_email_confirmed
* @property string $password * @property string $password
* @property string $locale
* @property string|null $avatar_url * @property string|null $avatar_url
* @property array $preferences * @property array $preferences
* @property \Carbon\Carbon|null $joined_at * @property \Carbon\Carbon|null $joined_at
@@ -312,18 +310,6 @@ class User extends AbstractModel
return static::$dispatcher->until(new GetDisplayName($this)) ?: $this->username; return static::$dispatcher->until(new GetDisplayName($this)) ?: $this->username;
} }
/**
* Get the user's locale, falling back to the forum's default if they
* haven't set one.
*
* @param string $value
* @return string
*/
public function getLocaleAttribute($value)
{
return $value ?: Application::config('locale', 'en');
}
/** /**
* Check if a given password matches the user's password. * Check if a given password matches the user's password.
* *