mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-15 11:14:12 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#840

Browse Source
This commit is contained in:
Ryan Cramer
2019-04-02 11:24:29 -04:00
parent e9620a3a47
commit dd183c0571
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wire/core/PagesNames.php
View File

@@ -319,8 +319,8 @@ class PagesNames extends Wire {
$name = wireDate(trim($format)); $name = wireDate(trim($format));
$formatType = 'date'; $formatType = 'date';
} else if(strpos($format, ' ') !== false || strpos($format, '/') !== false) { } else if(strpos($format, ' ') !== false || strpos($format, '/') !== false || strpos($format, ':') !== false) {
// date assumed when spaces or slashes present in format // date assumed when spaces, slashes or colon present in format
$name = wireDate($format); $name = wireDate($format);
$formatType = 'date'; $formatType = 'date';

2
wire/modules/Process/ProcessPageAdd/ProcessPageAdd.module
View File

@@ -1026,7 +1026,7 @@ class ProcessPageAdd extends Process implements ConfigurableModule, WirePageEdit
// allow for nameFormat to come from a name_format GET variable // allow for nameFormat to come from a name_format GET variable
$nameFormat = $this->wire('input')->get('name_format'); $nameFormat = $this->wire('input')->get('name_format');
if(strlen($nameFormat)) { if(strlen($nameFormat)) {
$nameFormat = $this->sanitizer->chars($this->sanitizer->text($nameFormat), '-_[alpha][digit]', '-'); $nameFormat = $this->sanitizer->chars($this->sanitizer->text($nameFormat), '-_:./| [alpha][digit]', '-');
} else { } else {
if(count($parent->template->childTemplates) > 1) return false; if(count($parent->template->childTemplates) > 1) return false;
$nameFormat = ''; $nameFormat = '';