From 44f22ac40b7b5119ed38b152f177ac5ec3a76e9b Mon Sep 17 00:00:00 2001 From: dereine Date: Mon, 27 Aug 2012 13:58:03 +0200 Subject: [PATCH] Issue #1758632 by dawehner: Remove options() out of the code. --- lib/Drupal/views/Plugin/views/PluginBase.php | 11 ----------- lib/Drupal/views/Plugin/views/style/DefaultStyle.php | 7 ------- 2 files changed, 18 deletions(-) diff --git a/lib/Drupal/views/Plugin/views/PluginBase.php b/lib/Drupal/views/Plugin/views/PluginBase.php index 44ec24bea94..f8cfd27ed55 100644 --- a/lib/Drupal/views/Plugin/views/PluginBase.php +++ b/lib/Drupal/views/Plugin/views/PluginBase.php @@ -92,14 +92,6 @@ abstract class PluginBase extends ComponentPluginBase { */ 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. * For backward compatibility, it sends the options array; this is a @@ -107,9 +99,6 @@ abstract class PluginBase extends ComponentPluginBase { */ function set_default_options() { $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) { diff --git a/lib/Drupal/views/Plugin/views/style/DefaultStyle.php b/lib/Drupal/views/Plugin/views/style/DefaultStyle.php index 93a8e7e29f9..7e646179059 100644 --- a/lib/Drupal/views/Plugin/views/style/DefaultStyle.php +++ b/lib/Drupal/views/Plugin/views/style/DefaultStyle.php @@ -40,13 +40,6 @@ class DefaultStyle extends StylePluginBase { */ protected $usesRowClass = TRUE; - /** - * Set default options - */ - function options(&$options) { - parent::options($options); - } - function options_form(&$form, &$form_state) { parent::options_form($form, $form_state); }