diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php index 5ff1fe6..8f55340 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php @@ -37,17 +37,17 @@ function title() { return check_plain($title); } - function default_actions($which = NULL) { + public function defaultActions($which = NULL) { // Disallow summary views on this argument. if (!$which) { - $actions = parent::default_actions(); + $actions = parent::defaultActions(); unset($actions['summary asc']); unset($actions['summary desc']); return $actions; } if ($which != 'summary asc' && $which != 'summary desc') { - return parent::default_actions($which); + return parent::defaultActions($which); } } diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php index 7c5a0eb..145807c 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php @@ -78,16 +78,16 @@ function set_breadcrumb(&$breadcrumb) { } /** - * Override default_actions() to remove summary actions. + * Override defaultActions() to remove summary actions. */ - function default_actions($which = NULL) { + function defaultActions($which = NULL) { if ($which) { if (in_array($which, array('ignore', 'not found', 'empty', 'default'))) { - return parent::default_actions($which); + return parent::defaultActions($which); } return; } - $actions = parent::default_actions(); + $actions = parent::defaultActions(); unset($actions['summary asc']); unset($actions['summary desc']); unset($actions['summary asc by count']); diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php index 655a90a..a8e7da0 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php @@ -92,7 +92,7 @@ function set_breadcrumb(&$breadcrumb) { } * @return TRUE/FALSE */ public function usesBreadcrumb() { - $info = $this->default_actions($this->options['default_action']); + $info = $this->defaultActions($this->options['default_action']); return !empty($info['breadcrumb']); } @@ -117,8 +117,8 @@ function exception_title() { * @return TRUE/FALSE */ public function needsStylePlugin() { - $info = $this->default_actions($this->options['default_action']); - $validate_info = $this->default_actions($this->options['validate']['fail']); + $info = $this->defaultActions($this->options['default_action']); + $validate_info = $this->defaultActions($this->options['validate']['fail']); return !empty($info['style plugin']) || !empty($validate_info['style plugin']); } @@ -223,7 +223,7 @@ public function buildOptionsForm(&$form, &$form_state) { ); $options = array(); - $defaults = $this->default_actions(); + $defaults = $this->defaultActions(); $validate_options = array(); foreach ($defaults as $id => $info) { $options[$id] = $info['title']; @@ -440,7 +440,7 @@ public function submitOptionsForm(&$form, &$form_state) { * * Override this method to provide additional (or fewer) default behaviors. */ - function default_actions($which = NULL) { + function defaultActions($which = NULL) { $defaults = array( 'ignore' => array( 'title' => t('Display all results for the specified field'), @@ -653,7 +653,7 @@ public function defaultSummaryForm(&$form, &$form_state) { */ function default_action($info = NULL) { if (!isset($info)) { - $info = $this->default_actions($this->options['default_action']); + $info = $this->defaultActions($this->options['default_action']); } if (!$info) { @@ -672,7 +672,7 @@ function default_action($info = NULL) { * How to act if validation failes */ public function validateFail() { - $info = $this->default_actions($this->options['validate']['fail']); + $info = $this->defaultActions($this->options['validate']['fail']); return $this->default_action($info); } /** @@ -734,7 +734,7 @@ function default_default() { * Determine if the argument is set to provide a default argument. */ function hasDefaultArgument() { - $info = $this->default_actions($this->options['default_action']); + $info = $this->defaultActions($this->options['default_action']); return !empty($info['has default argument']); } @@ -961,7 +961,7 @@ public function validateArgument($arg) { * then validation cannot actually fail. */ function validate_argument($arg) { - $validate_info = $this->default_actions($this->options['validate']['fail']); + $validate_info = $this->defaultActions($this->options['validate']['fail']); if (empty($validate_info['hard fail'])) { return TRUE; } @@ -970,7 +970,7 @@ function validate_argument($arg) { // If the validator has changed the validate fail condition to a // soft fail, deal with that: - $validate_info = $this->default_actions($this->options['validate']['fail']); + $validate_info = $this->defaultActions($this->options['validate']['fail']); if (empty($validate_info['hard fail'])) { return TRUE; } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php index 31e04b0..a486525 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php @@ -42,17 +42,17 @@ public function buildOptionsForm(&$form, &$form_state) { } /** - * Override default_actions() to remove actions that don't + * Override defaultActions() to remove actions that don't * make sense for a null argument. */ - function default_actions($which = NULL) { + function defaultActions($which = NULL) { if ($which) { if (in_array($which, array('ignore', 'not found', 'empty', 'default'))) { - return parent::default_actions($which); + return parent::defaultActions($which); } return; } - $actions = parent::default_actions(); + $actions = parent::defaultActions(); unset($actions['summary asc']); unset($actions['summary desc']); return $actions;