|
@@ -213,7 +213,7 @@ class FormBuilder |
|
@@ -213,7 +213,7 @@ class FormBuilder |
213
|
|
213
|
|
214
|
if (!in_array($type, $this->skipValueTypes)) {
|
214
|
if (!in_array($type, $this->skipValueTypes)) {
|
215
|
$value = $this->getValueAttribute($name, $value);
|
215
|
$value = $this->getValueAttribute($name, $value);
|
216
|
- $options['class'] = isset($options['class']) ? $options['class'] . ' form-control' : 'form-control';
|
216
|
+ $options['class'] = isset($options['class']) ? $options['class'] . (stripos($options['class'], 'form-control') !== false ? '' : ' form-control') : 'form-control';
|
217
|
}
|
217
|
}
|
218
|
|
218
|
|
219
|
$merge = compact('type', 'value', 'id');
|
219
|
$merge = compact('type', 'value', 'id');
|
|
@@ -317,7 +317,7 @@ class FormBuilder |
|
@@ -317,7 +317,7 @@ class FormBuilder |
317
|
|
317
|
|
318
|
unset($options['size']);
|
318
|
unset($options['size']);
|
319
|
|
319
|
|
320
|
- $options['class'] = isset($options['class']) ? $options['class'] . ' form-control' : 'form-control';
|
320
|
+ $options['class'] = isset($options['class']) ? $options['class'] . (stripos($options['class'], 'form-control') !== false ? '' : ' form-control') : 'form-control';
|
321
|
$options = $this->attributes($options);
|
321
|
$options = $this->attributes($options);
|
322
|
|
322
|
|
323
|
return '<textarea' . $options . '>' . $this->escape($value) . '</textarea>';
|
323
|
return '<textarea' . $options . '>' . $this->escape($value) . '</textarea>';
|
|
@@ -389,7 +389,7 @@ class FormBuilder |
|
@@ -389,7 +389,7 @@ class FormBuilder |
389
|
foreach ($list as $value => $display) {
|
389
|
foreach ($list as $value => $display) {
|
390
|
$html[] = $this->getSelectOption($display, $value, $selected);
|
390
|
$html[] = $this->getSelectOption($display, $value, $selected);
|
391
|
}
|
391
|
}
|
392
|
- $options['class'] = isset($options['class']) ? $options['class'] . ' form-control' : 'form-control';
|
392
|
+ $options['class'] = isset($options['class']) ? $options['class'] . (stripos($options['class'], 'form-control') !== false ? '' : ' form-control') : 'form-control';
|
393
|
|
393
|
|
394
|
$options = $this->attributes($options);
|
394
|
$options = $this->attributes($options);
|
395
|
$list = implode('', $html);
|
395
|
$list = implode('', $html);
|