Issue #1758632 by dawehner: Remove options() out of the code.
parent
87689a189a
commit
44f22ac40b
|
@ -92,14 +92,6 @@ abstract class PluginBase extends ComponentPluginBase {
|
||||||
*/
|
*/
|
||||||
function construct() { $this->set_default_options(); }
|
function construct() { $this->set_default_options(); }
|
||||||
|
|
||||||
/**
|
|
||||||
* Set default options on this object. Called by the constructor in a
|
|
||||||
* complex chain to deal with backward compatibility.
|
|
||||||
*
|
|
||||||
* @deprecated since views2
|
|
||||||
*/
|
|
||||||
function options(&$options) { }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set default options.
|
* Set default options.
|
||||||
* For backward compatibility, it sends the options array; this is a
|
* For backward compatibility, it sends the options array; this is a
|
||||||
|
@ -107,9 +99,6 @@ abstract class PluginBase extends ComponentPluginBase {
|
||||||
*/
|
*/
|
||||||
function set_default_options() {
|
function set_default_options() {
|
||||||
$this->_set_option_defaults($this->options, $this->option_definition());
|
$this->_set_option_defaults($this->options, $this->option_definition());
|
||||||
|
|
||||||
// Retained for complex defaults plus backward compatibility.
|
|
||||||
$this->options($this->options);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function _set_option_defaults(&$storage, $options, $level = 0) {
|
function _set_option_defaults(&$storage, $options, $level = 0) {
|
||||||
|
|
|
@ -40,13 +40,6 @@ class DefaultStyle extends StylePluginBase {
|
||||||
*/
|
*/
|
||||||
protected $usesRowClass = TRUE;
|
protected $usesRowClass = TRUE;
|
||||||
|
|
||||||
/**
|
|
||||||
* Set default options
|
|
||||||
*/
|
|
||||||
function options(&$options) {
|
|
||||||
parent::options($options);
|
|
||||||
}
|
|
||||||
|
|
||||||
function options_form(&$form, &$form_state) {
|
function options_form(&$form, &$form_state) {
|
||||||
parent::options_form($form, $form_state);
|
parent::options_form($form, $form_state);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue