Fixes #795: do not generate form-control css class for file input as it would display an unneeded border.

framework/yii/widgets/ActiveField.php

@@ -323,7 +323,9 @@ class ActiveField extends Component
 	 */
 	public function fileInput($options = array())
 	{
-		$options = array_merge($this->inputOptions, $options);
+		if ($this->inputOptions !== array('class' => 'form-control')) {
+			$options = array_merge($this->inputOptions, $options);
+		}
 		$this->parts['{input}'] = Html::activeFileInput($this->model, $this->attribute, $options);
 		return $this;
 	}