Upgrade to 3.2.5

This commit is contained in:
Bastian Allgeier
2019-09-24 11:00:59 +02:00
parent ff9b5b1861
commit 447a9dd266
234 changed files with 1990 additions and 1224 deletions

View File

@@ -17,7 +17,6 @@ use Kirby\Exception\PermissionException;
*/
class ContentLock
{
/**
* Lock data
*
@@ -33,7 +32,7 @@ class ContentLock
protected $model;
/**
* @param Kirby\Cms\ModelWithContent $model
* @param \Kirby\Cms\ModelWithContent $model
*/
public function __construct(ModelWithContent $model)
{
@@ -80,13 +79,13 @@ class ContentLock
$data['user'] !== $this->user()->id() &&
$user = $this->kirby()->user($data['user'])
) {
$time = intval($data['time']);
$time = (int)($data['time']);
return [
'user' => $user->id(),
'email' => $user->email(),
'time' => $time,
'unlockable' => $time + $this->kirby()->option('lock.duration', 60 * 2) <= time()
'unlockable' => ($time + 200) <= time()
];
}
@@ -124,7 +123,7 @@ class ContentLock
/**
* Returns the app instance
*
* @return Kirby\Cms\App
* @return \Kirby\Cms\App
*/
protected function kirby(): App
{
@@ -201,7 +200,7 @@ class ContentLock
* Returns currently authenticated user;
* throws exception if none is authenticated
*
* @return Kirby\Cms\User
* @return \Kirby\Cms\User
*/
protected function user(): User
{