Commit 0efe892f by Antonio Ramirez

fix merging issues

parent 16bc71fe
...@@ -50,9 +50,6 @@ class InputWidget extends Widget ...@@ -50,9 +50,6 @@ class InputWidget extends Widget
if ($this->hasModel() && !isset($this->options['id'])) { if ($this->hasModel() && !isset($this->options['id'])) {
$this->options['id'] = Html::getInputId($this->model, $this->attribute); $this->options['id'] = Html::getInputId($this->model, $this->attribute);
} }
if($this->hasModel() && !array_key_exists('id', $this->options)) {
$this->options['id'] = Html::getInputId($this->model, $this->attribute);
}
parent::init(); parent::init();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment