From dd183c05710ef9b1cc174de97661475d9df09c4e Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Tue, 2 Apr 2019 11:24:29 -0400 Subject: [PATCH] Fix issue processwire/processwire-issues#840 --- wire/core/PagesNames.php | 4 ++-- wire/modules/Process/ProcessPageAdd/ProcessPageAdd.module | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wire/core/PagesNames.php b/wire/core/PagesNames.php index 1e377e09..4a005135 100644 --- a/wire/core/PagesNames.php +++ b/wire/core/PagesNames.php @@ -319,8 +319,8 @@ class PagesNames extends Wire { $name = wireDate(trim($format)); $formatType = 'date'; - } else if(strpos($format, ' ') !== false || strpos($format, '/') !== false) { - // date assumed when spaces or slashes present in format + } else if(strpos($format, ' ') !== false || strpos($format, '/') !== false || strpos($format, ':') !== false) { + // date assumed when spaces, slashes or colon present in format $name = wireDate($format); $formatType = 'date'; diff --git a/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.module b/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.module index 98ef8e86..92bf7b56 100644 --- a/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.module +++ b/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.module @@ -1026,7 +1026,7 @@ class ProcessPageAdd extends Process implements ConfigurableModule, WirePageEdit // allow for nameFormat to come from a name_format GET variable $nameFormat = $this->wire('input')->get('name_format'); if(strlen($nameFormat)) { - $nameFormat = $this->sanitizer->chars($this->sanitizer->text($nameFormat), '-_[alpha][digit]', '-'); + $nameFormat = $this->sanitizer->chars($this->sanitizer->text($nameFormat), '-_:./| [alpha][digit]', '-'); } else { if(count($parent->template->childTemplates) > 1) return false; $nameFormat = '';