1
0
mirror of https://github.com/processwire/processwire.git synced 2025-08-10 00:37:02 +02:00
This commit is contained in:
Ryan Cramer
2022-07-08 13:02:33 -04:00
parent 03acb77306
commit 2da2c45382
5 changed files with 8 additions and 5 deletions

View File

@@ -41,6 +41,7 @@ class FilenameArray implements \IteratorAggregate, \Countable {
*
*/
protected function getKey($filename) {
$filename = (string) $filename;
$pos = strpos($filename, '?');
$key = $pos ? substr($filename, 0, $pos) : $filename;
return md5($key);

View File

@@ -1831,6 +1831,8 @@ abstract class Inputfield extends WireData implements Module {
/** @var Sanitizer $sanitizer */
$sanitizer = $this->wire('sanitizer');
$str = (string) $str;
// if already encoded, then un-encode it
if(strpos($str, '&') !== false && preg_match('/&(#\d+|[a-zA-Z]+);/', $str)) {
$str = $sanitizer->unentities($str);

View File

@@ -2788,7 +2788,7 @@ class PageFinder extends Wire {
} else if(in_array($field, array('created', 'modified', 'published'))) {
// prepare value for created, modified or published date fields
if(!ctype_digit($value)) {
if(!ctype_digit("$value")) {
$value = $datetime->strtotime($value);
}
if(empty($value)) {