Upgrade to 3.7.2

This commit is contained in:
Bastian Allgeier
2022-07-27 15:34:32 +02:00
parent 1ad1eaf387
commit 833f327139
26 changed files with 204 additions and 66 deletions

View File

@@ -205,6 +205,16 @@ class Block extends Item
return $this->isEmpty() === false;
}
/**
* Returns the sibling collection that filtered by block status
*
* @return \Kirby\Cms\Collection
*/
protected function siblingsCollection()
{
return $this->siblings->filter('isHidden', $this->isHidden());
}
/**
* Returns the block type
*

View File

@@ -73,6 +73,7 @@ class Core
'installation' => $this->root . '/areas/installation.php',
'languages' => $this->root . '/areas/languages.php',
'login' => $this->root . '/areas/login.php',
'logout' => $this->root . '/areas/logout.php',
'site' => $this->root . '/areas/site.php',
'system' => $this->root . '/areas/system.php',
'users' => $this->root . '/areas/users.php',

View File

@@ -71,6 +71,7 @@ class Txt extends Handler
*/
protected static function encodeResult(string $key, string $value): string
{
$value = trim($value);
$result = $key . ':';
// multi-line content
@@ -80,7 +81,7 @@ class Txt extends Handler
$result .= ' ';
}
$result .= trim($value);
$result .= $value;
return $result;
}

View File

@@ -73,7 +73,10 @@ class Panel
// not yet authenticated
if (!$user) {
return [
'login' => static::area('login', $areas['login']),
'logout' => static::area('logout', $areas['logout']),
// login area last because it defines a fallback route
'login' => static::area('login', $areas['login']),
];
}

View File

@@ -37,7 +37,7 @@ class Inline
public function __construct(DOMNode $node, array $marks = [])
{
$this->createMarkRules($marks);
$this->html = trim(static::parseNode($node, $this->marks));
$this->html = trim(static::parseNode($node, $this->marks) ?? '');
}
/**