diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml index cfb8121a1..371b00755 100644 --- a/system/blueprints/config/system.yaml +++ b/system/blueprints/config/system.yaml @@ -58,7 +58,7 @@ form: default: "jS M Y" options: "F jS \\a\\t g:ia": Date1 - "l jS of F g:i A": Date2 + "l jS \\of F g:i A": Date2 "D, m M Y G:i:s": Date3 "d-m-y G:i": Date4 "jS M Y": Date5 @@ -71,7 +71,7 @@ form: help: PLUGIN_ADMIN.LONG_DATE_FORMAT_HELP options: "F jS \\a\\t g:ia": Date1 - "l jS of F g:i A": Date2 + "l jS \\of F g:i A": Date2 "D, m M Y G:i:s": Date3 "d-m-y G:i": Date4 "jS M Y": Date5 @@ -324,7 +324,7 @@ form: size: small classes: fancy label: PLUGIN_ADMIN.CACHE_CHECK_METHOD - help: PLUGIN_ADMIN.CACHE_CHECK_METHOD + help: PLUGIN_ADMIN.CACHE_CHECK_METHOD_HELP options: file: File folder: Folder diff --git a/system/blueprints/user/account_new.yaml b/system/blueprints/user/account_new.yaml index 202f68814..6c6505bdb 100644 --- a/system/blueprints/user/account_new.yaml +++ b/system/blueprints/user/account_new.yaml @@ -11,5 +11,6 @@ form: username: type: text label: PLUGIN_ADMIN.USERNAME + help: PLUGIN_ADMIN.USERNAME_HELP validate: required: true diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php index 4e88ce5a0..ed961594e 100644 --- a/system/src/Grav/Common/Page/Page.php +++ b/system/src/Grav/Common/Page/Page.php @@ -1737,7 +1737,7 @@ class Page if (isset($routes[$uri_path])) { $child_page = $pages->dispatch($uri->route())->parent(); - while (!$child_page->root()) { + if ($child_page) while (!$child_page->root()) { if ($this->path() == $child_page->path()) { return true; } diff --git a/system/src/Grav/Console/Cli/NewUserCommand.php b/system/src/Grav/Console/Cli/NewUserCommand.php index cbab7804d..2e3da7db8 100644 --- a/system/src/Grav/Console/Cli/NewUserCommand.php +++ b/system/src/Grav/Console/Cli/NewUserCommand.php @@ -53,7 +53,7 @@ class NewUserCommand extends Command $question->setValidator(function ($value) { if (!preg_match('/^[a-z0-9_-]{3,16}$/', $value)) { throw new RuntimeException( - 'Username should be between 3 and 16 comprised of lowercase letters, numbers, underscores and hyphens' + 'Username should be between 3 and 16 characters, including lowercase letters, numbers, underscores, and hyphens. Uppercase letters, spaces, and special characters are not allowed' ); } if (file_exists(self::getGrav()['locator']->findResource('user://accounts/' . $value . YAML_EXT))) {