mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-18 04:22:10 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#743

Browse Source
This commit is contained in:
Ryan Cramer
2018-11-30 13:15:27 -05:00
parent 45e8a00395
commit 9aa0de6351
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wire/core/Selectors.php
View File

@@ -104,6 +104,7 @@ class Selectors extends WireArray {
* *
*/ */
public function __construct($selector = null) { public function __construct($selector = null) {
parent::__construct();
if(!is_null($selector)) $this->init($selector); if(!is_null($selector)) $this->init($selector);
} }
@@ -228,7 +229,7 @@ class Selectors extends WireArray {
if(!isset(self::$selectorTypes[$operator])) return false; if(!isset(self::$selectorTypes[$operator])) return false;
$type = self::$selectorTypes[$operator]; $type = self::$selectorTypes[$operator];
// now double check that we can map it back, in case PHP filters anything in the isset() // now double check that we can map it back, in case PHP filters anything in the isset()
$op = array_search($type); $op = array_search($type, self::$selectorTypes);
if($op === $operator) { if($op === $operator) {
if($is) return true; if($is) return true;
// Convert types like "SelectorEquals" to "Equals" // Convert types like "SelectorEquals" to "Equals"
@@ -399,7 +400,7 @@ class Selectors extends WireArray {
* *
* @param string $field Field name or names (separated by a pipe) * @param string $field Field name or names (separated by a pipe)
* @param string $operator Operator, i.e. "=" * @param string $operator Operator, i.e. "="
* @param string $value Value or values (separated by a pipe) * @param string|array $value Value or values (separated by a pipe)
* @return Selector Returns the correct type of `Selector` object that corresponds to the given `$operator`. * @return Selector Returns the correct type of `Selector` object that corresponds to the given `$operator`.
* @throws WireException * @throws WireException
* *
@@ -1150,7 +1151,7 @@ class Selectors extends WireArray {
$_sanitize = $sanitize; $_sanitize = $sanitize;
if(is_array($value)) $value = 'array'; // we don't allow arrays here if(is_array($value)) $value = 'array'; // we don't allow arrays here
if(is_object($value)) $value = (string) $value; if(is_object($value)) $value = (string) $value;
if(is_int($value) || ctype_digit($value)) { if(is_int($value) || (ctype_digit("$value") && strpos($value, '0') !== 0)) {
$value = (int) $value; $value = (int) $value;
if($_sanitize == 'selectorValue') $_sanitize = ''; // no need to sanitize integer to string if($_sanitize == 'selectorValue') $_sanitize = ''; // no need to sanitize integer to string
} }