diff --git a/wire/core/WireInput.php b/wire/core/WireInput.php index de39fb33..f95943cd 100644 --- a/wire/core/WireInput.php +++ b/wire/core/WireInput.php @@ -113,6 +113,8 @@ class WireInput extends Wire { 'DELETE' => 'DELETE', 'OPTIONS' => 'OPTIONS', 'PATCH' => 'PATCH', + 'CONNECT' => 'CONNECT', + 'TRACE' => 'TRACE', ); /** diff --git a/wire/modules/Inputfield/InputfieldText/InputfieldText.module b/wire/modules/Inputfield/InputfieldText/InputfieldText.module index af77ba89..0321a4fc 100644 --- a/wire/modules/Inputfield/InputfieldText/InputfieldText.module +++ b/wire/modules/Inputfield/InputfieldText/InputfieldText.module @@ -134,8 +134,10 @@ class InputfieldText extends Inputfield { } } - if(!strlen($attrs['value']) && $this->initValue) { - $attrs['value'] = $this->initValue; + if($this->initValue) { + if(!strlen($attrs['value'])) { + $attrs['value'] = $this->initValue; + } } if(isset($attrs['minlength'])) { diff --git a/wire/modules/Inputfield/InputfieldTextarea.module b/wire/modules/Inputfield/InputfieldTextarea.module index f65cb9e6..99398d08 100644 --- a/wire/modules/Inputfield/InputfieldTextarea.module +++ b/wire/modules/Inputfield/InputfieldTextarea.module @@ -86,11 +86,12 @@ class InputfieldTextarea extends InputfieldText { public function ___render() { $attrs = $this->getAttributes(); + $value = $attrs['value']; unset($attrs['value'], $attrs['size'], $attrs['type']); $out = ""; return $out; } @@ -171,9 +172,11 @@ class InputfieldTextarea extends InputfieldText { public function ___getConfigInputfields() { $inputfields = parent::___getConfigInputfields(); - $inputfields->remove($inputfields->getChildByName('size')); // size is not applicable to textarea - $inputfields->remove($inputfields->getChildByName('pattern')); // pattern is not applicable to textarea - //if($this->hasFieldtype !== false) $inputfields->remove($inputfields->get('maxlength')); + $removes = array('size', 'pattern'); + foreach($removes as $name) { + $f = $inputfields->getChildByName($name); + if($f) $inputfields->remove($f); + } /** @var InputfieldInteger $field */ $field = $this->modules->get('InputfieldInteger');