diff --git a/wire/core/DatabaseQuerySelectFulltext.php b/wire/core/DatabaseQuerySelectFulltext.php index 6b85fe39..dc27e7c9 100644 --- a/wire/core/DatabaseQuerySelectFulltext.php +++ b/wire/core/DatabaseQuerySelectFulltext.php @@ -245,7 +245,7 @@ class DatabaseQuerySelectFulltext extends Wire { * */ protected function escapeLike($str) { - return str_replace(array('%', '_'), array('\\%', '\\_'), $str); + return str_replace(array('%', '_'), array('\\%', '\\_'), "$str"); } /** @@ -258,7 +258,7 @@ class DatabaseQuerySelectFulltext extends Wire { * */ protected function escapeAgainst($str) { - $str = str_replace(array('@', '+', '-', '*', '~', '<', '>', '(', ')', ':', '"', '&', '|', '=', '.'), ' ', $str); + $str = str_replace(array('@', '+', '-', '*', '~', '<', '>', '(', ')', ':', '"', '&', '|', '=', '.'), ' ', "$str"); while(strpos($str, ' ')) $str = str_replace(' ', ' ', $str); return $str; } @@ -270,7 +270,7 @@ class DatabaseQuerySelectFulltext extends Wire { */ protected function value($value) { $maxLength = self::maxQueryValueLength; - $value = trim($value); + $value = trim("$value"); if(strlen($value) < $maxLength && strpos($value, "\n") === false && strpos($value, "\r") === false) return $value; $value = $this->sanitizer->trunc($value, $maxLength); return $value; diff --git a/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module b/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module index 2bd60e54..f13198e3 100644 --- a/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module +++ b/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module @@ -3465,9 +3465,9 @@ class ProcessPageEdit extends Process implements WirePageEditor, ConfigurableMod */ public function getModuleConfigInputfields(array $data) { - $config = $this->config; - $pages = $this->pages; - $modules = $this->modules; + $config = $this->wire()->config; + $pages = $this->wire()->pages; + $modules = $this->wire()->modules; $inputfields = new InputfieldWrapper(); $this->wire($inputfields);