Upgrade to 3.3.5

kirby/composer.json

@@ -1,7 +1,7 @@
 {
   "name": "getkirby/cms",
   "description": "The Kirby 3 core",
-  "version": "3.3.4",
+  "version": "3.3.5",
   "license": "proprietary",
   "keywords": ["kirby", "cms", "core"],
   "homepage": "https://getkirby.com",

kirby/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fb4c488a44bae1ff2733bf8802b2dbba",
+    "content-hash": "75d7a57ba26b69913bbde61153e82d78",
     "packages": [
         {
             "name": "claviska/simpleimage",

kirby/config/fields/mixins/picker.php

@@ -25,6 +25,13 @@ return [
             return $info;
         },
 
+        /**
+         * Whether each item should be clickable
+         */
+        'link' => function (bool $link = true) {
+            return $link;
+        },
+
         /**
          * The minimum number of required selected
          */

kirby/config/helpers.php

@@ -401,15 +401,25 @@ function kirby()
  * @param string|array $type
  * @param string $value
  * @param array $attr
+ * @param array $data
  * @return string
  */
-function kirbytag($type, string $value = null, array $attr = []): string
+function kirbytag($type, string $value = null, array $attr = [], array $data = []): string
 {
     if (is_array($type) === true) {
-        return App::instance()->kirbytag(key($type), current($type), $type);
+        $kirbytag = $type;
+        $type     = key($kirbytag);
+        $value    = current($kirbytag);
+        $attr     = $kirbytag;
+
+        // check data attribute and separate from attr data if exists
+        if (isset($attr['data']) === true) {
+            $data = $attr['data'];
+            unset($attr['data']);
+        }
     }
 
-    return App::instance()->kirbytag($type, $value, $attr);
+    return App::instance()->kirbytag($type, $value, $attr, $data);
 }
 
 /**

kirby/i18n/translations/cs.json

@@ -43,7 +43,7 @@
   "error.avatar.create.fail": "Nebylo možné nahrát profilový obrázek",
   "error.avatar.delete.fail": "Nebylo mo\u017en\u00e9 smazat profilov\u00fd obr\u00e1zek",
   "error.avatar.dimensions.invalid":
-    "Výšku a šířka profilového obrázku by měla být pod 3000 pixelů",
+    "Šířka a výška obrázku musí být pod 3000 pixelů",
   "error.avatar.mime.forbidden":
     "Profilový obrázek musí být ve formátu JPEG nebo PNG",
 
@@ -61,21 +61,21 @@
     "Přípona souboru \"{extension}\" není povolena",
   "error.file.extension.missing":
     "Nem\u016f\u017eete nahr\u00e1t soubor bez p\u0159\u00edpony",
-  "error.file.maxheight": "The height of the image must not exceed {height} pixels",
+  "error.file.maxheight": "Výška obrázku nesmí přesáhnout {height} pixelů",
-  "error.file.maxsize": "The file is too large",
+  "error.file.maxsize": "Soubor je příliš velký",
-  "error.file.maxwidth": "The width of the image must not exceed {width} pixels",
+  "error.file.maxwidth": "Šířka obrázku nesmí přesáhnout {width} pixelů",
   "error.file.mime.differs":
     "Nahraný soubor musí být stejného typu \"{mime}\"",
   "error.file.mime.forbidden": "Soubor typu \"{mime}\" není povolený",
-  "error.file.mime.invalid": "Invalid mime type: {mime}",
+  "error.file.mime.invalid": "Neplatný MIME typ: {mime}",
   "error.file.mime.missing":
     "Nelze rozeznat mime typ souboru \"{filename}\"",
-  "error.file.minheight": "The height of the image must be at least {height} pixels",
+  "error.file.minheight": "Výška obrázku musí být alespoň {height} pixelů",
-  "error.file.minsize": "The file is too small",
+  "error.file.minsize": "Soubor je příliš malý",
-  "error.file.minwidth": "The width of the image must be at least {width} pixels",
+  "error.file.minwidth": "Šířka obrázku musí být alespoň {width} pixelů",
   "error.file.name.missing": "Název souboru nesmí být prázdný",
   "error.file.notFound": "Soubor se nepoda\u0159ilo nal\u00e9zt",
-  "error.file.orientation": "The orientation of the image must be \"{orientation}\"",
+  "error.file.orientation": "Orientace obrázku másí být \"{orientation}\"",
   "error.file.type.forbidden": "Nemáte povoleno nahrávat soubory typu {type} ",
   "error.file.undefined": "Soubor se nepoda\u0159ilo nal\u00e9zt",
 

kirby/src/Cms/App.php

@@ -12,7 +12,6 @@ use Kirby\Http\Router;
 use Kirby\Http\Server;
 use Kirby\Http\Visitor;
 use Kirby\Session\AutoSession;
-use Kirby\Text\KirbyTag;
 use Kirby\Toolkit\A;
 use Kirby\Toolkit\Config;
 use Kirby\Toolkit\Controller;

kirby/src/Cms/FileActions.php

@@ -163,7 +163,7 @@ trait FileActions
         $props['model'] = strtolower($props['template'] ?? 'default');
 
         // create the basic file and a test upload object
-        $file = File::factory($props);
+        $file = static::factory($props);
         $upload = new Image($props['source']);
 
         // create a form for the file

kirby/src/Cms/FileRules.php

@@ -135,6 +135,13 @@ class FileRules
             ]);
         }
 
+        if (Str::contains($extension, 'htm')) {
+            throw new InvalidArgumentException([
+                'key'  => 'file.type.forbidden',
+                'data' => ['type' => 'HTML']
+            ]);
+        }
+
         return true;
     }
 

kirby/src/Cms/HasSiblings.php

@@ -17,51 +17,81 @@ trait HasSiblings
     /**
      * Returns the position / index in the collection
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return int
      */
-    public function indexOf(): int
+    public function indexOf($collection = null): int
     {
-        return $this->siblingsCollection()->indexOf($this);
+        if ($collection === null) {
+            $collection = $this->siblingsCollection();
+        }
+
+        return $collection->indexOf($this);
     }
 
     /**
      * Returns the next item in the collection if available
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return \Kirby\Cms\Model|null
      */
-    public function next()
+    public function next($collection = null)
     {
-        return $this->siblingsCollection()->nth($this->indexOf() + 1);
+        if ($collection === null) {
+            $collection = $this->siblingsCollection();
+        }
+
+        return $collection->nth($this->indexOf($collection) + 1);
     }
 
     /**
      * Returns the end of the collection starting after the current item
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return \Kirby\Cms\Collection
      */
-    public function nextAll()
+    public function nextAll($collection = null)
     {
-        return $this->siblingsCollection()->slice($this->indexOf() + 1);
+        if ($collection === null) {
+            $collection = $this->siblingsCollection();
+        }
+
+        return $collection->slice($this->indexOf($collection) + 1);
     }
 
     /**
      * Returns the previous item in the collection if available
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return \Kirby\Cms\Model|null
      */
-    public function prev()
+    public function prev($collection = null)
     {
-        return $this->siblingsCollection()->nth($this->indexOf() - 1);
+        if ($collection === null) {
+            $collection = $this->siblingsCollection();
+        }
+
+        return $collection->nth($this->indexOf($collection) - 1);
     }
 
     /**
      * Returns the beginning of the collection before the current item
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return \Kirby\Cms\Collection
      */
-    public function prevAll()
+    public function prevAll($collection = null)
     {
-        return $this->siblingsCollection()->slice(0, $this->indexOf());
+        if ($collection === null) {
+            $collection = $this->siblingsCollection();
+        }
+
+        return $collection->slice(0, $this->indexOf($collection));
     }
 
     /**
@@ -84,51 +114,69 @@ trait HasSiblings
     /**
      * Checks if there's a next item in the collection
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return bool
      */
-    public function hasNext(): bool
+    public function hasNext($collection = null): bool
     {
-        return $this->next() !== null;
+        return $this->next($collection) !== null;
     }
 
     /**
      * Checks if there's a previous item in the collection
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return bool
      */
-    public function hasPrev(): bool
+    public function hasPrev($collection = null): bool
     {
-        return $this->prev() !== null;
+        return $this->prev($collection) !== null;
     }
 
     /**
      * Checks if the item is the first in the collection
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return bool
      */
-    public function isFirst(): bool
+    public function isFirst($collection = null): bool
     {
-        return $this->siblingsCollection()->first()->is($this);
+        if ($collection === null) {
+            $collection = $this->siblingsCollection();
+        }
+
+        return $collection->first()->is($this);
     }
 
     /**
      * Checks if the item is the last in the collection
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return bool
      */
-    public function isLast(): bool
+    public function isLast($collection = null): bool
     {
-        return $this->siblingsCollection()->last()->is($this);
+        if ($collection === null) {
+            $collection = $this->siblingsCollection();
+        }
+
+        return $collection->last()->is($this);
     }
 
     /**
      * Checks if the item is at a certain position
      *
+     * @param \Kirby\Cms\Collection|null $collection
      * @param int $n
+     *
      * @return bool
      */
-    public function isNth(int $n): bool
+    public function isNth(int $n, $collection = null): bool
     {
-        return $this->indexOf() === $n;
+        return $this->indexOf($collection) === $n;
     }
 }

kirby/src/Cms/Language.php

@@ -342,6 +342,45 @@ class Language extends Model
         }
     }
 
+    /**
+     * Returns the locale array but with the locale
+     * constants replaced with their string representations
+     *
+     * @return array
+     */
+    protected function localeExport(): array
+    {
+        // list of all possible constant names
+        $constantNames = [
+            'LC_ALL', 'LC_COLLATE', 'LC_CTYPE', 'LC_MONETARY',
+            'LC_NUMERIC', 'LC_TIME', 'LC_MESSAGES'
+        ];
+
+        // build an associative array with the locales
+        // that are actually supported on this system
+        $constants = [];
+        foreach ($constantNames as $name) {
+            if (defined($name) === true) {
+                $constants[constant($name)] = $name;
+            }
+        }
+
+        // replace the keys in the locale data array with the locale names
+        $return = [];
+        foreach ($this->locale() as $key => $value) {
+            if (isset($constants[$key]) === true) {
+                // the key is a valid constant,
+                // replace it with its string representation
+                $return[$constants[$key]] = $value;
+            } else {
+                // not found, keep it as-is
+                $return[$key] = $value;
+            }
+        }
+
+        return $return;
+    }
+
     /**
      * Returns the human-readable name
      * of the language
@@ -448,7 +487,7 @@ class Language extends Model
             'code'         => $this->code(),
             'default'      => $this->isDefault(),
             'direction'    => $this->direction(),
-            'locale'       => $this->locale(),
+            'locale'       => $this->localeExport(),
             'name'         => $this->name(),
             'translations' => $this->translations(),
             'url'          => $this->url,
@@ -500,7 +539,17 @@ class Language extends Model
     protected function setLocale($locale = null)
     {
         if (is_array($locale)) {
-            $this->locale = $locale;
+            // replace string constant keys with the constant values
+            $convertedLocale = [];
+            foreach ($locale as $key => $value) {
+                if (is_string($key) === true && Str::startsWith($key, 'LC_') === true) {
+                    $key = constant($key);
+                }
+
+                $convertedLocale[$key] = $value;
+            }
+
+            $this->locale = $convertedLocale;
         } elseif (is_string($locale)) {
             $this->locale = [LC_ALL => $locale];
         } elseif ($locale === null) {

kirby/src/Cms/LanguageRouter.php

@@ -117,7 +117,10 @@ class LanguageRouter
         $router   = new Router($this->routes());
 
         try {
-            return $router->call($path, $kirby->request()->method(), function ($route) use ($language) {
+            return $router->call($path, $kirby->request()->method(), function ($route) use ($kirby, $language) {
+                $kirby->setCurrentTranslation($language);
+                $kirby->setCurrentLanguage($language);
+
                 if ($page = $route->page()) {
                     return $route->action()->call($route, $language, $page, ...$route->arguments());
                 } else {

kirby/src/Cms/LanguageRoutes.php

@@ -78,6 +78,17 @@ class LanguageRoutes
                     ]);
 
                     if ($url->toString() !== $page->url()) {
+                        // redirect to translated page directly
+                        // if translation is exists and languages detect is enabled
+                        if (
+                            $kirby->option('languages.detect') === true &&
+                            $page->translation($kirby->detectedLanguage()->code())->exists() === true
+                        ) {
+                            return $kirby
+                                ->response()
+                                ->redirect($page->url($kirby->detectedLanguage()->code()));
+                        }
+
                         return $kirby
                             ->response()
                             ->redirect($page->url());

kirby/src/Cms/Page.php

@@ -693,24 +693,6 @@ class Page extends ModelWithContent
         return $this->id() === $this->site()->errorPageId();
     }
 
-    /**
-     * Check if the page can be read by the current user
-     *
-     * @return bool
-     */
-    public function isReadable(): bool
-    {
-        static $readable = [];
-
-        $template = $this->intendedTemplate()->name();
-
-        if (isset($readable[$template]) === true) {
-            return $readable[$template];
-        }
-
-        return $readable[$template] = $this->permissions()->can('read');
-    }
-
     /**
      * Checks if the page is the home page
      *
@@ -776,6 +758,34 @@ class Page extends ModelWithContent
         return false;
     }
 
+    /**
+     * Checks if the page is not a draft.
+     *
+     * @return bool
+     */
+    public function isPublished(): bool
+    {
+        return $this->isDraft() === false;
+    }
+
+    /**
+     * Check if the page can be read by the current user
+     *
+     * @return bool
+     */
+    public function isReadable(): bool
+    {
+        static $readable = [];
+
+        $template = $this->intendedTemplate()->name();
+
+        if (isset($readable[$template]) === true) {
+            return $readable[$template];
+        }
+
+        return $readable[$template] = $this->permissions()->can('read');
+    }
+
     /**
      * Checks if the page is sortable
      *
@@ -1128,8 +1138,6 @@ class Page extends ModelWithContent
 
         // fetch the page regularly
         if ($html === null) {
-            $kirby->data = $this->controller($data, $contentType);
-
             if ($contentType === 'html') {
                 $template = $this->template();
             } else {
@@ -1142,6 +1150,8 @@ class Page extends ModelWithContent
                 ]);
             }
 
+            $kirby->data = $this->controller($data, $contentType);
+
             // render the page
             $html = $template->render($kirby->data);
 
@@ -1168,7 +1178,7 @@ class Page extends ModelWithContent
     public function representation($type)
     {
         $kirby          = $this->kirby();
-        $template       = $this->intendedTemplate();
+        $template       = $this->template();
         $representation = $kirby->template($template->name(), $type);
 
         if ($representation->exists() === true) {

kirby/src/Cms/PageSiblings.php

@@ -13,176 +13,104 @@ namespace Kirby\Cms;
  */
 trait PageSiblings
 {
-    /**
-     * @deprecated 3.0.0 Use `Page::hasNextUnlisted()` instead
-     * @return bool
-     */
-    public function hasNextInvisible(): bool
-    {
-        deprecated('$page->hasNextInvisible() is deprecated, use $page->hasNextUnlisted() instead. $page->hasNextInvisible() will be removed in Kirby 3.5.0.');
-
-        return $this->hasNextUnlisted();
-    }
-
     /**
      * Checks if there's a next listed
      * page in the siblings collection
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return bool
      */
-    public function hasNextListed(): bool
+    public function hasNextListed($collection = null): bool
     {
-        return $this->nextListed() !== null;
+        return $this->nextListed($collection) !== null;
     }
 
     /**
      * Checks if there's a next unlisted
      * page in the siblings collection
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return bool
      */
-    public function hasNextUnlisted(): bool
+    public function hasNextUnlisted($collection = null): bool
     {
-        return $this->nextUnlisted() !== null;
+        return $this->nextUnlisted($collection) !== null;
-    }
-
-    /**
-     * @deprecated 3.0.0 Use `Page::hasNextListed()` instead
-     * @return bool
-     */
-    public function hasNextVisible(): bool
-    {
-        deprecated('$page->hasNextVisible() is deprecated, use $page->hasNextListed() instead. $page->hasNextVisible() will be removed in Kirby 3.5.0.');
-
-        return $this->hasNextListed();
-    }
-
-    /**
-     * @deprecated 3.0.0 Use `Page::hasPrevUnlisted()` instead
-     * @return bool
-     */
-    public function hasPrevInvisible(): bool
-    {
-        deprecated('$page->hasPrevInvisible() is deprecated, use $page->hasPrevUnlisted() instead. $page->hasPrevInvisible() will be removed in Kirby 3.5.0.');
-
-        return $this->hasPrevUnlisted();
     }
 
     /**
      * Checks if there's a previous listed
      * page in the siblings collection
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return bool
      */
-    public function hasPrevListed(): bool
+    public function hasPrevListed($collection = null): bool
     {
-        return $this->prevListed() !== null;
+        return $this->prevListed($collection) !== null;
     }
 
     /**
      * Checks if there's a previous unlisted
      * page in the siblings collection
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return bool
      */
-    public function hasPrevUnlisted(): bool
+    public function hasPrevUnlisted($collection = null): bool
     {
-        return $this->prevUnlisted() !== null;
+        return $this->prevUnlisted($collection) !== null;
-    }
-
-    /**
-     * @deprecated 3.0.0 Use `Page::hasPrevListed()` instead
-     * @return bool
-     */
-    public function hasPrevVisible(): bool
-    {
-        deprecated('$page->hasPrevVisible() is deprecated, use $page->hasPrevListed() instead. $page->hasPrevVisible() will be removed in Kirby 3.5.0.');
-
-        return $this->hasPrevListed();
-    }
-
-    /**
-     * @deprecated 3.0.0 Use `Page::nextUnlisted()` instead
-     * @return self|null
-     */
-    public function nextInvisible()
-    {
-        deprecated('$page->nextInvisible() is deprecated, use $page->nextUnlisted() instead. $page->nextInvisible() will be removed in Kirby 3.5.0.');
-
-        return $this->nextUnlisted();
     }
 
     /**
      * Returns the next listed page if it exists
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return \Kirby\Cms\Page|null
      */
-    public function nextListed()
+    public function nextListed($collection = null)
     {
-        return $this->nextAll()->listed()->first();
+        return $this->nextAll($collection)->listed()->first();
     }
 
     /**
      * Returns the next unlisted page if it exists
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return \Kirby\Cms\Page|null
      */
-    public function nextUnlisted()
+    public function nextUnlisted($collection = null)
     {
-        return $this->nextAll()->unlisted()->first();
+        return $this->nextAll($collection)->unlisted()->first();
-    }
-
-    /**
-     * @deprecated 3.0.0 Use `Page::nextListed()` instead
-     * @return self|null
-     */
-    public function nextVisible()
-    {
-        deprecated('$page->nextVisible() is deprecated, use $page->nextListed() instead. $page->nextVisible() will be removed in Kirby 3.5.0.');
-
-        return $this->nextListed();
-    }
-
-    /**
-     * @deprecated 3.0.0 Use `Page::prevUnlisted()` instead
-     * @return self|null
-     */
-    public function prevInvisible()
-    {
-        deprecated('$page->prevInvisible() is deprecated, use $page->prevUnlisted() instead. $page->prevInvisible() will be removed in Kirby 3.5.0.');
-
-        return $this->prevUnlisted();
     }
 
     /**
      * Returns the previous listed page
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return \Kirby\Cms\Page|null
      */
-    public function prevListed()
+    public function prevListed($collection = null)
     {
-        return $this->prevAll()->listed()->last();
+        return $this->prevAll($collection)->listed()->last();
     }
 
     /**
      * Returns the previous unlisted page
      *
+     * @param \Kirby\Cms\Collection|null $collection
+     *
      * @return \Kirby\Cms\Page|null
      */
-    public function prevUnlisted()
+    public function prevUnlisted($collection = null)
     {
-        return $this->prevAll()->unlisted()->first();
+        return $this->prevAll($collection)->unlisted()->first();
-    }
-
-    /**
-     * @deprecated 3.0.0 Use `Page::prevListed()` instead
-     * @return self|null
-     */
-    public function prevVisible()
-    {
-        deprecated('$page->prevVisible() is deprecated, use $page->prevListed() instead. $page->prevVisible() will be removed in Kirby 3.5.0.');
-
-        return $this->prevListed();
     }
 
     /**
@@ -209,4 +137,93 @@ trait PageSiblings
     {
         return $this->siblings($self)->filterBy('intendedTemplate', $this->intendedTemplate()->name());
     }
+
+    /**
+     * @deprecated 3.0.0 Use `Page::hasNextUnlisted()` instead
+     * @return bool
+     */
+    public function hasNextInvisible(): bool
+    {
+        deprecated('$page->hasNextInvisible() is deprecated, use $page->hasNextUnlisted() instead. $page->hasNextInvisible() will be removed in Kirby 3.5.0.');
+
+        return $this->hasNextUnlisted();
+    }
+
+    /**
+     * @deprecated 3.0.0 Use `Page::hasNextListed()` instead
+     * @return bool
+     */
+    public function hasNextVisible(): bool
+    {
+        deprecated('$page->hasNextVisible() is deprecated, use $page->hasNextListed() instead. $page->hasNextVisible() will be removed in Kirby 3.5.0.');
+
+        return $this->hasNextListed();
+    }
+
+    /**
+     * @deprecated 3.0.0 Use `Page::hasPrevUnlisted()` instead
+     * @return bool
+     */
+    public function hasPrevInvisible(): bool
+    {
+        deprecated('$page->hasPrevInvisible() is deprecated, use $page->hasPrevUnlisted() instead. $page->hasPrevInvisible() will be removed in Kirby 3.5.0.');
+
+        return $this->hasPrevUnlisted();
+    }
+
+    /**
+     * @deprecated 3.0.0 Use `Page::hasPrevListed()` instead
+     * @return bool
+     */
+    public function hasPrevVisible(): bool
+    {
+        deprecated('$page->hasPrevVisible() is deprecated, use $page->hasPrevListed() instead. $page->hasPrevVisible() will be removed in Kirby 3.5.0.');
+
+        return $this->hasPrevListed();
+    }
+
+    /**
+     * @deprecated 3.0.0 Use `Page::nextUnlisted()` instead
+     * @return self|null
+     */
+    public function nextInvisible()
+    {
+        deprecated('$page->nextInvisible() is deprecated, use $page->nextUnlisted() instead. $page->nextInvisible() will be removed in Kirby 3.5.0.');
+
+        return $this->nextUnlisted();
+    }
+
+
+    /**
+     * @deprecated 3.0.0 Use `Page::nextListed()` instead
+     * @return self|null
+     */
+    public function nextVisible()
+    {
+        deprecated('$page->nextVisible() is deprecated, use $page->nextListed() instead. $page->nextVisible() will be removed in Kirby 3.5.0.');
+
+        return $this->nextListed();
+    }
+
+    /**
+     * @deprecated 3.0.0 Use `Page::prevUnlisted()` instead
+     * @return self|null
+     */
+    public function prevInvisible()
+    {
+        deprecated('$page->prevInvisible() is deprecated, use $page->prevUnlisted() instead. $page->prevInvisible() will be removed in Kirby 3.5.0.');
+
+        return $this->prevUnlisted();
+    }
+
+    /**
+     * @deprecated 3.0.0 Use `Page::prevListed()` instead
+     * @return self|null
+     */
+    public function prevVisible()
+    {
+        deprecated('$page->prevVisible() is deprecated, use $page->prevListed() instead. $page->prevVisible() will be removed in Kirby 3.5.0.');
+
+        return $this->prevListed();
+    }
 }

kirby/src/Cms/UserActions.php

@@ -277,6 +277,26 @@ trait UserActions
         return F::read($this->root() . '/.htpasswd');
     }
 
+    /**
+     * Updates the user data
+     *
+     * @param array $input
+     * @param string $language
+     * @param bool $validate
+     * @return self
+     */
+    public function update(array $input = null, string $language = null, bool $validate = false)
+    {
+        $user = parent::update($input, $language, $validate);
+
+        // set auth user data only if the current user is this user
+        if ($user->isLoggedIn() === true) {
+            $this->kirby()->auth()->setUser($user);
+        }
+
+        return $user;
+    }
+
     /**
      * This always merges the existing credentials
      * with the given input.

kirby/src/Toolkit/Dir.php

@@ -98,6 +98,17 @@ class Dir
         return $result;
     }
 
+    /**
+     * Checks if the directory exsits on disk
+     *
+     * @param string $dir
+     * @return bool
+     */
+    public static function exists(string $dir): bool
+    {
+        return is_dir($dir) === true;
+    }
+
     /**
      * Get all files
      *

kirby/src/Toolkit/Query.php

@@ -15,7 +15,7 @@ namespace Kirby\Toolkit;
  */
 class Query
 {
-    const PARTS      = '!([a-zA-Z_]*(\(.*?\))?)\.|' . self::SKIP . '!';
+    const PARTS      = '!([a-zA-Z_][a-zA-Z0-9_]*(\(.*?\))?)\.|' . self::SKIP . '!';
     const METHOD     = '!\((.*)\)!';
     const PARAMETERS = '!,|' . self::SKIP . '!';