mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #4873 from xini/fix-compositefield-extraclass
FIX extraClass() method to match parent method
This commit is contained in:
commit
5470f23e2f
@ -122,9 +122,17 @@ class CompositeField extends FormField {
|
|||||||
public function getLegend() {
|
public function getLegend() {
|
||||||
return $this->legend;
|
return $this->legend;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
*/
|
||||||
public function extraClasses() {
|
public function extraClasses() {
|
||||||
$classes = array('field', 'CompositeField', parent::extraClasses());
|
Deprecation::notice('4.0', 'Use extraClass() instead');
|
||||||
|
return $this->extraClass();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function extraClass() {
|
||||||
|
$classes = array('field', 'CompositeField', parent::extraClass());
|
||||||
if($this->columnCount) $classes[] = 'multicolumn';
|
if($this->columnCount) $classes[] = 'multicolumn';
|
||||||
|
|
||||||
return implode(' ', $classes);
|
return implode(' ', $classes);
|
||||||
|
Loading…
Reference in New Issue
Block a user