diff --git a/modules/backend/classes/FilterScope.php b/modules/backend/classes/FilterScope.php index 6989aa376..d7e76a3a2 100644 --- a/modules/backend/classes/FilterScope.php +++ b/modules/backend/classes/FilterScope.php @@ -24,12 +24,12 @@ class FilterScope /** * @var string Column to display for the display name */ - public $nameColumn = 'name'; + public $nameFrom = 'name'; /** * @var string Column to display for the description (optional) */ - public $descriptionColumn; + public $descriptionFrom; /** * @var string Filter scope label. @@ -119,8 +119,10 @@ class FilterScope if (isset($config['conditions'])) $this->conditions = $config['conditions']; if (isset($config['scope'])) $this->scope = $config['scope']; if (isset($config['cssClass'])) $this->cssClass = $config['cssClass']; - if (isset($config['nameColumn'])) $this->nameColumn = $config['nameColumn']; - if (isset($config['descriptionColumn'])) $this->descriptionColumn = $config['descriptionColumn']; + if (isset($config['nameFrom'])) $this->nameFrom = $config['nameFrom']; + if (isset($config['descriptionFrom'])) $this->descriptionFrom = $config['descriptionFrom']; + + /* @todo Remove line if year >= 2015 */ if (isset($config['nameColumn'])) $this->nameFrom = $config['nameColumn']; if (array_key_exists('disabled', $config)) $this->disabled = $config['disabled']; return $config; diff --git a/modules/backend/widgets/Filter.php b/modules/backend/widgets/Filter.php index d1b34aa47..4dc0a3776 100644 --- a/modules/backend/widgets/Filter.php +++ b/modules/backend/widgets/Filter.php @@ -414,7 +414,7 @@ class Filter extends WidgetBase if (is_string($scope)) $scope = $this->getScope($scope); - return $scope->nameColumn; + return $scope->nameFrom; } /**