Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-06 07:27:03 +02:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' of https://github.com/getgrav/grav into develop

Browse Source
This commit is contained in:
Andy Miller
2015-08-28 10:59:59 -06:00
parent 826fa8e225 c41e58b1d7
commit 8bdef0dc57
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system/blueprints/config/system.yaml
View File

@@ -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

1
system/blueprints/user/account_new.yaml
View File

@@ -11,5 +11,6 @@ form:
username:
type: text
label: PLUGIN_ADMIN.USERNAME
help: PLUGIN_ADMIN.USERNAME_HELP
validate:
required: true

2
system/src/Grav/Common/Page/Page.php
View File

@@ -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;
}

2
system/src/Grav/Console/Cli/NewUserCommand.php
View File

@@ -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))) {