diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php index a2b8b63..275a8f0 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php @@ -80,7 +80,7 @@ public function submitOptionsForm(&$form, &$form_state, &$options = array()) { $options['types'] = array_filter($options['types']); } - function validate_argument($argument) { + function validateArgument($argument) { $types = $this->options['types']; switch ($this->options['nid_type']) { diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php index b93aa87..76f0b36 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php @@ -93,7 +93,7 @@ public function submitOptionsForm(&$form, &$form_state, &$options = array()) { $options['vids'] = array_filter($options['vids']); } - function validate_argument($argument) { + function validateArgument($argument) { $vocabularies = array_filter($this->options['vids']); $type = $this->options['type']; $transform = $this->options['transform']; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php index cc518c3..a6a64a2 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php @@ -72,7 +72,7 @@ public function submitOptionsForm(&$form, &$form_state, &$options = array()) { $options['roles'] = array_filter($options['roles']); } - function validate_argument($argument) { + function validateArgument($argument) { $type = $this->options['type']; // is_numeric() can return false positives, so we ensure it's an integer. // However, is_integer() will always fail, since $argument is a string. 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 dd86190..4974380 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 @@ -950,7 +950,7 @@ public function validateArgument($arg) { } $plugin = $this->getPlugin('argument_validator'); - return $this->argument_validated = $plugin->validate_argument($arg); + return $this->argument_validated = $plugin->validateArgument($arg); } /** @@ -960,7 +960,7 @@ public function validateArgument($arg) { * argument fails to validate, but there is an action to take anyway, * then validation cannot actually fail. */ - function validate_argument($arg) { + public function validateMenuArgument($arg) { $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_validator/ArgumentValidatorPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php index e7945dc..297703d 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php @@ -80,7 +80,7 @@ protected function checkAccess(&$form, $option_name) { } } - function validate_argument($arg) { return TRUE; } + function validateArgument($arg) { return TRUE; } /** * Process the summary arguments for displaying. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php index 7a63069..1ef3667 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php @@ -22,7 +22,7 @@ */ class None extends ArgumentValidatorPluginBase { - function validate_argument($argument) { + function validateArgument($argument) { if (!empty($this->argument->options['must_not_be'])) { return !isset($argument); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php index 6db339e..ee53f64 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php @@ -22,7 +22,7 @@ */ class Numeric extends ArgumentValidatorPluginBase { - function validate_argument($argument) { + function validateArgument($argument) { return is_numeric($argument); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Php.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Php.php index dc16a1c..82c1f65 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Php.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Php.php @@ -49,7 +49,7 @@ public function access() { return user_access('use PHP for settings'); } - function validate_argument($argument) { + function validateArgument($argument) { // set up variables to make it easier to reference during the argument. $view = &$this->view; $handler = &$this->argument; diff --git a/core/modules/views/views.module b/core/modules/views/views.module index d755506..4d656b6 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -404,7 +404,7 @@ function views_arg_load($value, $name, $display_id, $index) { if (isset($indexes[$index])) { if (isset($view->argument[$indexes[$index]])) { - $arg = $view->argument[$indexes[$index]]->validate_argument($value) ? $value : FALSE; + $arg = $view->argument[$indexes[$index]]->validateMenuArgument($value) ? $value : FALSE; $view->destroy(); // Store the output in case we load this same menu item again.