fix merging issues

11 years ago · 0efe892f15
1 changed files with 0 additions and 3 deletions
--- a/extensions/yii/jui/InputWidget.php
+++ b/extensions/yii/jui/InputWidget.php
@ -50,9 +50,6 @@ class InputWidget extends Widget
 		if ($this->hasModel() && !isset($this->options['id'])) {
 			$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();
 	}