interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.0.3

Browse Source
This commit is contained in:
Bastian Allgeier
2019-03-05 10:55:03 +01:00
parent 8e3d86a590
commit 418db4b09b
40 changed files with 704 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kirby/src/Cms/Role.php
View File

@@ -6,6 +6,7 @@ use Exception;
use Kirby\Data\Data;
use Kirby\Exception\NotFoundException;
use Kirby\Toolkit\F;
use Kirby\Toolkit\I18n;
/**
* Represents a User role with attached
@@ -92,10 +93,8 @@ class Role extends Model
public static function load(string $file, array $inject = []): self
{
$name = F::name($file);
$data = Data::read($file);
$data['name'] = $name;
$data['name'] = F::name($file);
return static::factory($data, $inject);
}
@@ -119,9 +118,9 @@ class Role extends Model
return $this->permissions;
}
protected function setDescription(string $description = null): self
protected function setDescription($description = null): self
{
$this->description = $description;
$this->description = I18n::translate($description, $description);
return $this;
}
@@ -139,7 +138,7 @@ class Role extends Model
protected function setTitle($title = null): self
{
$this->title = $title;
$this->title = I18n::translate($title, $title);
return $this;
}