summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2013-06-15 11:45:48 +0200
committerAlex Pott2013-06-15 11:45:48 +0200
commit5c09348793e4c7aceb1b344ae5fc399013e45da4 (patch)
tree70b94f710330ef7feaa607fa4a776e8cf6804c51
parent863a9bd821d1a33324d7ca9653d6d32bbde2d8e8 (diff)
Issue #2002438 by theladebug, malcomio, heddn: Rename Views method default_action() to defaultAction().
-rw-r--r--core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php4
-rw-r--r--core/modules/views/lib/Drupal/views/ViewExecutable.php2
2 files changed, 3 insertions, 3 deletions
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 3f5ae44..d4864cd 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
@@ -651,7 +651,7 @@ abstract class ArgumentPluginBase extends HandlerBase {
* A boolean value; if TRUE, continue building this view. If FALSE,
* building the view will be aborted here.
*/
- function default_action($info = NULL) {
+ public function defaultAction($info = NULL) {
if (!isset($info)) {
$info = $this->defaultActions($this->options['default_action']);
}
@@ -673,7 +673,7 @@ abstract class ArgumentPluginBase extends HandlerBase {
*/
public function validateFail() {
$info = $this->defaultActions($this->options['validate']['fail']);
- return $this->default_action($info);
+ return $this->defaultAction($info);
}
/**
* Default action: ignore.
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index d1ef4c3..d3c939e 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -914,7 +914,7 @@ class ViewExecutable {
}
else {
// determine default condition and handle.
- $status = $argument->default_action();
+ $status = $argument->defaultAction();
break;
}