summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2013-06-05 08:29:08 +0100
committerAlex Pott2013-06-05 08:29:08 +0100
commit3e83ff9777b3dc206c403712981c94f36b7727c3 (patch)
tree175b01a6bb0b7c2ca77a3b15588988d58d480d41
parent7b3a9a93ceedc79f7f4c21ef3eb677beb88001df (diff)
Issue #2002448 by theladebug, brandon_beeler: Rename Views method default_display_filters_user() to defaultDisplayFiltersUser().
-rw-r--r--core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php6
-rw-r--r--core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php
index 1a73147..0c9ed3e 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php
@@ -165,10 +165,10 @@ class Node extends WizardPluginBase {
}
/**
- * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_filters_user().
+ * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::defaultDisplayFiltersUser().
*/
- protected function default_display_filters_user(array $form, array &$form_state) {
- $filters = parent::default_display_filters_user($form, $form_state);
+ protected function defaultDisplayFiltersUser(array $form, array &$form_state) {
+ $filters = parent::defaultDisplayFiltersUser($form, $form_state);
if (!empty($form_state['values']['show']['tagged_with']['tids'])) {
$filters['tid'] = array(
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 9e0c3f8..046b1e2 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -805,7 +805,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
}
// Add any filters specified by the user when filling out the wizard.
- $filters = array_merge($filters, $this->default_display_filters_user($form, $form_state));
+ $filters = array_merge($filters, $this->defaultDisplayFiltersUser($form, $form_state));
return $filters;
}
@@ -822,7 +822,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
* An array of filter arrays keyed by ID. A sort array contains the options
* accepted by a filter handler.
*/
- protected function default_display_filters_user(array $form, array &$form_state) {
+ protected function defaultDisplayFiltersUser(array $form, array &$form_state) {
$filters = array();
if (!empty($form_state['values']['show']['type']) && $form_state['values']['show']['type'] != 'all') {