diff --git a/wire/core/AdminTheme.php b/wire/core/AdminTheme.php index a04fdfd8..004b829e 100644 --- a/wire/core/AdminTheme.php +++ b/wire/core/AdminTheme.php @@ -280,7 +280,7 @@ abstract class AdminTheme extends WireData implements Module { * Omit the first argument to return all classes in an array. * * @param string $name Tag or item name, i.e. “input”, or omit to return all defined [tags=classes] - * @param bool $getArray Specify true to return array of class name(s) rather than string (default=false). $tagName argument required. + * @param bool $getArray Specify true to return array of class name(s) rather than string (default=false). $name argument required. * @return string|array Returns string or array of class names, or array of all [tags=classes] or $tagName argument is empty. * */ diff --git a/wire/core/DatabaseQuerySelectFulltext.php b/wire/core/DatabaseQuerySelectFulltext.php index 0cdf89ec..0dda284d 100644 --- a/wire/core/DatabaseQuerySelectFulltext.php +++ b/wire/core/DatabaseQuerySelectFulltext.php @@ -350,10 +350,12 @@ class DatabaseQuerySelectFulltext extends Wire { * */ protected function matchArrayValue(array $value) { - + + /* if(strpos($this->operator, '~') !== false) { throw new WireException("Operator $this->operator is not supported for $this->fieldName with OR value condition"); } + */ // convert *= operator to %= to make the query possible (avoiding matchContains method) // if($this->operator === '*=') $this->operator = '%='; diff --git a/wire/core/FieldtypeMulti.php b/wire/core/FieldtypeMulti.php index 2722283a..9f9ebce5 100644 --- a/wire/core/FieldtypeMulti.php +++ b/wire/core/FieldtypeMulti.php @@ -478,7 +478,7 @@ abstract class FieldtypeMulti extends Fieldtype { $query->data('_table', $table); foreach($filters as $selector) { - // @todo add support for OR values of $col or $value + $col = $selector->field; $op = $selector->operator; $value = $selector->value; diff --git a/wire/core/Modules.php b/wire/core/Modules.php index c7b35591..2b854f81 100644 --- a/wire/core/Modules.php +++ b/wire/core/Modules.php @@ -3861,7 +3861,7 @@ class Modules extends WireArray { $query->bindValue(":data", $json, \PDO::PARAM_STR); $query->bindValue(":id", (int) $id, \PDO::PARAM_INT); $result = $query->execute(); - $this->log("Saved module '$moduleName' config data"); + // $this->log("Saved module '$moduleName' config data"); return $result; } diff --git a/wire/core/WireHttp.php b/wire/core/WireHttp.php index d84b3c1b..16c219dd 100644 --- a/wire/core/WireHttp.php +++ b/wire/core/WireHttp.php @@ -364,7 +364,7 @@ class WireHttp extends Wire { * @param string $url URL to request (including http:// or https://) * @param mixed $data Array of data to send (if not already set before) or raw data to send * @param array $options Optional options to modify default behavior, see the send() method for details. - * @return bool|array False on failure or Arrray with ResponseHeaders on success. + * @return bool|array False on failure or Array with ResponseHeaders on success. * @see WireHttp::send(), WireHttp::post(), WireHttp::get() * */ diff --git a/wire/modules/Process/ProcessPageView.module b/wire/modules/Process/ProcessPageView.module index 2c920714..c27f589a 100644 --- a/wire/modules/Process/ProcessPageView.module +++ b/wire/modules/Process/ProcessPageView.module @@ -1008,7 +1008,7 @@ class ProcessPageView extends Process { } // options for WireHttp::sendFile - $defaults = array('exit' => false); + $defaults = array('exit' => false, 'limitPath' => $page->filesPath()); $options = array_merge($defaults, $options); $this->wire()->files->send($filename, $options);