diff --git a/help/api-example.html b/help/api-example.html
index 55cace3f4e8977fd91c40820f1ed1df4e19ca1c5..654fbffcdc335d66edb0f5aab94feed107a63259 100644
--- a/help/api-example.html
+++ b/help/api-example.html
@@ -73,14 +73,14 @@
'title' => t('Quantity'),
'help' => t('Quantity of items.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -90,17 +90,17 @@
'help' => t('Color of item.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
diff --git a/includes/admin.inc b/includes/admin.inc
index cf2343d5bc36a7257b7e9bf795aece71de563645..0cace87ecfa6ec094bb2c9c4f88dc0064216da5c 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -706,9 +706,9 @@ function views_ui_nojs_submit($form, &$form_state) {
function views_ui_wizard_form_validate($form, &$form_state) {
$wizard = views_ui_get_wizard($form_state['values']['show']['wizard_key']);
$manager = new ViewsPluginManager('wizard');
- $definition = $manager->getDefinition($wizard['plugin_id']);
+ $definition = $manager->getDefinition($wizard['id']);
$form_state['wizard'] = $wizard;
- $form_state['wizard_instance'] = $manager->createInstance($wizard['plugin_id'], $definition);
+ $form_state['wizard_instance'] = $manager->createInstance($wizard['id'], $definition);
$errors = $form_state['wizard_instance']->validate($form, $form_state);
foreach ($errors as $name => $message) {
form_set_error($name, $message);
diff --git a/includes/cache.inc b/includes/cache.inc
index 0574a3791905bc07848d771d5c2ae1cac92f1f3b..19117309930d5aed5cb6ef8aa4a828dd33337c0c 100644
--- a/includes/cache.inc
+++ b/includes/cache.inc
@@ -88,8 +88,8 @@ function _views_data_process_entity_types(&$data) {
/**
* Fetch the plugin data from cache.
*/
-function _views_fetch_plugin_data($type = NULL, $plugin_id = NULL, $reset = FALSE) {
- if (!$type && !$plugin_id) {
+function _views_fetch_plugin_data($type = NULL, $id = NULL, $reset = FALSE) {
+ if (!$type && !$id) {
$plugins = array();
$plugin_types = array('access', 'argument', 'argument_default', 'argument_validator', 'cache', 'display_extender', 'display', 'exposed_form', 'localization', 'pager', 'query', 'row', 'style', 'wizard');
foreach ($plugin_types as $plugin_type) {
@@ -101,11 +101,11 @@ function _views_fetch_plugin_data($type = NULL, $plugin_id = NULL, $reset = FALS
$manager = new ViewsPluginManager($type);
- if (!$plugin_id) {
+ if (!$id) {
return $manager->getDefinitions();
}
else {
- return $manager->getDefinition($plugin_id);
+ return $manager->getDefinition($id);
}
}
diff --git a/includes/handlers.inc b/includes/handlers.inc
index 0c83e34391db5e1d443b3b036b520fdf79220e00..e68d5e584eac2ae36b9d3c416fd935101f9802cb 100644
--- a/includes/handlers.inc
+++ b/includes/handlers.inc
@@ -16,11 +16,11 @@
*/
function _views_create_plugin($type, $definition) {
$manager = new ViewsPluginManager($type);
- $instance = $manager->createInstance($definition['plugin_id']);
+ $instance = $manager->createInstance($definition['id']);
$instance->is_plugin = TRUE;
$instance->plugin_type = $type;
- $instance->plugin_name = $definition['plugin_id'];
+ $instance->plugin_name = $definition['id'];
$instance->set_definition($definition);
@@ -35,7 +35,7 @@ function _views_create_plugin($type, $definition) {
*/
function _views_create_handler($type, $definition) {
$manager = new ViewsPluginManager($type);
- $instance = $manager->createInstance($definition['plugin_id']);
+ $instance = $manager->createInstance($definition['id']);
$instance->is_handler = TRUE;
$instance->handler_type = $type;
diff --git a/lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php b/lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php
index 434758f0c6974b457ec4ba11f1518ef263b42997..7a97616080c913950a0f6cb181a99403bf099dad 100644
--- a/lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php
+++ b/lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php
@@ -44,7 +44,7 @@ public function getDefinitions() {
}
// merge the new data in
- $definitions[$definition['plugin_id']] = $definition;
+ $definitions[$definition['id']] = $definition;
}
return $definitions;
diff --git a/lib/Drupal/views/Plugin/views/Plugin.php b/lib/Drupal/views/Plugin/views/Plugin.php
index d4723e3a15608b9eda4e8c2c53be1a2ac7bf1d83..44b7fb495df831db4501d709937265e2cee4dace 100644
--- a/lib/Drupal/views/Plugin/views/Plugin.php
+++ b/lib/Drupal/views/Plugin/views/Plugin.php
@@ -11,9 +11,9 @@
use Drupal\Component\Plugin\PluginBase;
abstract class Plugin extends PluginBase {
- public function __construct(array $configuration, $plugin_id) {
+ public function __construct(array $configuration, $id) {
$this->configuration = $configuration;
- $this->plugin_id = $plugin_id;
+ $this->id = $id;
}
/**
diff --git a/lib/Drupal/views/Plugin/views/access/None.php b/lib/Drupal/views/Plugin/views/access/None.php
index 2dccd35e62e3bccccad88652346cf8688c5e7a5a..05d8ad1da98c576529fa15de7ce5fc9c517a3425 100644
--- a/lib/Drupal/views/Plugin/views/access/None.php
+++ b/lib/Drupal/views/Plugin/views/access/None.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "none",
+ * id = "none",
* title = @Translation("None"),
* help = @Translation("Will be available to all users."),
* help_topic = "access-none"
diff --git a/lib/Drupal/views/Plugin/views/access/Permission.php b/lib/Drupal/views/Plugin/views/access/Permission.php
index 37a36ad3fe49b69409bd322fd3b4599249f3d0a6..87f4376cd62e3d62be6d05cb8ab14194337c8b51 100644
--- a/lib/Drupal/views/Plugin/views/access/Permission.php
+++ b/lib/Drupal/views/Plugin/views/access/Permission.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "permission",
+ * id = "permission",
* title = @Translation("Permission"),
* help = @Translation("Access will be granted to users with the specified permission string."),
* help_topic = "access-perm",
diff --git a/lib/Drupal/views/Plugin/views/access/Role.php b/lib/Drupal/views/Plugin/views/access/Role.php
index e0104349efde951bdef51e152a0aa6b1f4ea828f..a21c2968eeba591e011f3d6118f983a086d388ef 100644
--- a/lib/Drupal/views/Plugin/views/access/Role.php
+++ b/lib/Drupal/views/Plugin/views/access/Role.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "role",
+ * id = "role",
* title = @Translation("Role"),
* help = @Translation("Access will be granted to users with any of the specified roles."),
* help_topic = "access-role",
diff --git a/lib/Drupal/views/Plugin/views/area/Broken.php b/lib/Drupal/views/Plugin/views/area/Broken.php
index be22ec965d7b37f74fddeb6f5d75dc6594fe0a2d..6636b039d1da687c40e77fe61cd8b69339d19a47 100644
--- a/lib/Drupal/views/Plugin/views/area/Broken.php
+++ b/lib/Drupal/views/Plugin/views/area/Broken.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "broken"
+ * id = "broken"
* )
*/
class Broken extends AreaPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/area/Result.php b/lib/Drupal/views/Plugin/views/area/Result.php
index 137edca96399a49f5ee200d671570da65e92d915..fe5bc24676a17dc50463bcbaf3070d4d49338ef3 100644
--- a/lib/Drupal/views/Plugin/views/area/Result.php
+++ b/lib/Drupal/views/Plugin/views/area/Result.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "result"
+ * id = "result"
* )
*/
class Result extends AreaPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/area/Text.php b/lib/Drupal/views/Plugin/views/area/Text.php
index 5b281985f215ad4afc010b83d6204f439bf4318f..5834b3455661cdba015a248638dbcecf707363e4 100644
--- a/lib/Drupal/views/Plugin/views/area/Text.php
+++ b/lib/Drupal/views/Plugin/views/area/Text.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "text"
+ * id = "text"
* )
*/
class Text extends AreaPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/area/TextCustom.php b/lib/Drupal/views/Plugin/views/area/TextCustom.php
index de49c993c7cf9a239c298cb8577fc0a3b0ceabb3..bb3e1908be6234d761278344ed02ce54173d3ae2 100644
--- a/lib/Drupal/views/Plugin/views/area/TextCustom.php
+++ b/lib/Drupal/views/Plugin/views/area/TextCustom.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "text_custom"
+ * id = "text_custom"
* )
*/
class TextCustom extends AreaPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/area/View.php b/lib/Drupal/views/Plugin/views/area/View.php
index 2e9e790948cf2960be0be7be7c0c030c7ec5bc41..7432df0f1c57af65d5ce24a1cb15595cdc51a627 100644
--- a/lib/Drupal/views/Plugin/views/area/View.php
+++ b/lib/Drupal/views/Plugin/views/area/View.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "view"
+ * id = "view"
* )
*/
class View extends AreaPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/argument/Broken.php b/lib/Drupal/views/Plugin/views/argument/Broken.php
index 286fb0277fd17e20b19e36a3294463bcb72762c2..7ffc83456ba0dd70ef16a755dead1681aa672c25 100644
--- a/lib/Drupal/views/Plugin/views/argument/Broken.php
+++ b/lib/Drupal/views/Plugin/views/argument/Broken.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "broken"
+ * id = "broken"
* )
*/
class Broken extends ArgumentPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/argument/Date.php b/lib/Drupal/views/Plugin/views/argument/Date.php
index 5189b9a44f246a960c8abeca2204522cb4a88332..333fc8e163f7961fa633ca4200d35198a409900d 100644
--- a/lib/Drupal/views/Plugin/views/argument/Date.php
+++ b/lib/Drupal/views/Plugin/views/argument/Date.php
@@ -30,7 +30,7 @@
/**
* @Plugin(
- * plugin_id = "date"
+ * id = "date"
* )
*/
class Date extends ArgumentPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/argument/Formula.php b/lib/Drupal/views/Plugin/views/argument/Formula.php
index 7a4681f0626f1ebdb056575733f30dc638724361..9f47b8c00ff884dba6453d9ba14f4a7ebc7e320d 100644
--- a/lib/Drupal/views/Plugin/views/argument/Formula.php
+++ b/lib/Drupal/views/Plugin/views/argument/Formula.php
@@ -22,7 +22,7 @@
/**
* @Plugin(
- * plugin_id = "formula"
+ * id = "formula"
* )
*/
class Formula extends ArgumentPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php b/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
index bdbdd35ccd6657463b8298bb621f11fbe69c8e59..61c8b919973ddc2b01f083c576744212788e7cd7 100644
--- a/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
+++ b/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "groupby_numeric"
+ * id = "groupby_numeric"
* )
*/
class GroupByNumeric extends ArgumentPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/argument/ManyToOne.php b/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
index 37c3095e888636b3a94c0e73d4fd1924ffe2547f..cda7cbdded13825bf80088785fe811d86fcdfeec 100644
--- a/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
+++ b/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
@@ -26,7 +26,7 @@
/**
* @Plugin(
- * plugin_id = "many_to_one"
+ * id = "many_to_one"
* )
*/
class ManyToOne extends ArgumentPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/argument/Null.php b/lib/Drupal/views/Plugin/views/argument/Null.php
index 6b3450d92a9c8a4db2299e2f7faf14402bee5ea4..e8449b2096471e533b0a57c85e149d483482d01d 100644
--- a/lib/Drupal/views/Plugin/views/argument/Null.php
+++ b/lib/Drupal/views/Plugin/views/argument/Null.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "null"
+ * id = "null"
* )
*/
class Null extends ArgumentPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/argument/Numeric.php b/lib/Drupal/views/Plugin/views/argument/Numeric.php
index 78c84c92782c427bda4f050ba1e79fe697a30283..2444cfd9bfd4891ccc014db5bcc12a165dd0394e 100644
--- a/lib/Drupal/views/Plugin/views/argument/Numeric.php
+++ b/lib/Drupal/views/Plugin/views/argument/Numeric.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "numeric"
+ * id = "numeric"
* )
*/
class Numeric extends ArgumentPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/argument/String.php b/lib/Drupal/views/Plugin/views/argument/String.php
index 0c150dbfa7b7c555d2e795bdd7eeb5e04fbcdb69..69bc15c90508455f75081f95ac1e0bf048ed8c50 100644
--- a/lib/Drupal/views/Plugin/views/argument/String.php
+++ b/lib/Drupal/views/Plugin/views/argument/String.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "string"
+ * id = "string"
* )
*/
class String extends ArgumentPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/argument_default/Fixed.php b/lib/Drupal/views/Plugin/views/argument_default/Fixed.php
index 4796bb5b28c777c12987676e7062423f1670cb7e..b9979d96b245bdee401501e934fa00550005f49a 100644
--- a/lib/Drupal/views/Plugin/views/argument_default/Fixed.php
+++ b/lib/Drupal/views/Plugin/views/argument_default/Fixed.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "fixed",
+ * id = "fixed",
* title = @Translation("Fixed")
* )
*/
diff --git a/lib/Drupal/views/Plugin/views/argument_default/Php.php b/lib/Drupal/views/Plugin/views/argument_default/Php.php
index 704e02f2036842fc478f63962fd06fcfc996876c..da988db1dac04b6d35a1128cdfa9a48332f3fc4d 100644
--- a/lib/Drupal/views/Plugin/views/argument_default/Php.php
+++ b/lib/Drupal/views/Plugin/views/argument_default/Php.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "php",
+ * id = "php",
* title = @Translation("PHP Code")
* )
*/
diff --git a/lib/Drupal/views/Plugin/views/argument_default/Raw.php b/lib/Drupal/views/Plugin/views/argument_default/Raw.php
index e8c70b4b13e8081e32d273a3118d016455bb2302..209ed34a9d3b8748cf756f4c6e9446c3d12e182b 100644
--- a/lib/Drupal/views/Plugin/views/argument_default/Raw.php
+++ b/lib/Drupal/views/Plugin/views/argument_default/Raw.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "raw",
+ * id = "raw",
* title = @Translation("Raw value from URL")
* )
*/
diff --git a/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php b/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php
index fc17f1f8ccae4dba578541264cd2a7982c0c8882..c5c7cd7ab5488d2631074fdfddac30e520cadc10 100644
--- a/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php
+++ b/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "numeric",
+ * id = "numeric",
* title = @Translation("Numeric")
* )
*/
diff --git a/lib/Drupal/views/Plugin/views/argument_validator/Php.php b/lib/Drupal/views/Plugin/views/argument_validator/Php.php
index 40e9e6772e1aadd4494436acd98cead02f4dafe8..7586f7ca5272e6f070324b03c7a9e32b7c62c4fd 100644
--- a/lib/Drupal/views/Plugin/views/argument_validator/Php.php
+++ b/lib/Drupal/views/Plugin/views/argument_validator/Php.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "php",
+ * id = "php",
* title = @Translation("PHP Code")
* )
*/
diff --git a/lib/Drupal/views/Plugin/views/cache/None.php b/lib/Drupal/views/Plugin/views/cache/None.php
index e11b5766e884cb0023c2198bd2b7d514be297192..f78f77d8f2f57bd2049f23cde23127906c31fdbb 100644
--- a/lib/Drupal/views/Plugin/views/cache/None.php
+++ b/lib/Drupal/views/Plugin/views/cache/None.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "none",
+ * id = "none",
* title = @Translation("None"),
* help = @Translation("No caching of Views data."),
* help_topic = "cache-none"
diff --git a/lib/Drupal/views/Plugin/views/cache/Time.php b/lib/Drupal/views/Plugin/views/cache/Time.php
index 9920b195ec23e3fae527b5f4e8c7625c3ac921a2..471eaae342b193d1a515239fda0612b97a847806 100644
--- a/lib/Drupal/views/Plugin/views/cache/Time.php
+++ b/lib/Drupal/views/Plugin/views/cache/Time.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "time",
+ * id = "time",
* title = @Translation("Time-based"),
* help = @Translation("Simple time-based caching of data."),
* help_topic = "cache-time",
diff --git a/lib/Drupal/views/Plugin/views/display/Attachment.php b/lib/Drupal/views/Plugin/views/display/Attachment.php
index 1c071e038fe305e74e9f5e22d13baf1083df844a..2e52a5d107a3690bdc818523d1ab5e72165683b1 100644
--- a/lib/Drupal/views/Plugin/views/display/Attachment.php
+++ b/lib/Drupal/views/Plugin/views/display/Attachment.php
@@ -22,7 +22,7 @@
/**
* @Plugin(
- * plugin_id = "attachment",
+ * id = "attachment",
* title = @Translation("Attachment"),
* help = @Translation("Attachments added to other displays to achieve multiple views in the same view."),
* theme = "views_view",
diff --git a/lib/Drupal/views/Plugin/views/display/Block.php b/lib/Drupal/views/Plugin/views/display/Block.php
index abb47151efaaff5f5765f152cc5225fe4777d309..70d1ce23c784c4884ccb6a4dfd2cc53701e8708b 100644
--- a/lib/Drupal/views/Plugin/views/display/Block.php
+++ b/lib/Drupal/views/Plugin/views/display/Block.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "block",
+ * id = "block",
* title = @Translation("Block"),
* help = @Translation("Display the view as a block."),
* theme = "views_view",
diff --git a/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php b/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
index 463922e66db5f52559a2cbf0ed76f012687c7bd6..db01b417e48837c9a2378f46268e98a93306dd57 100644
--- a/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
+++ b/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "default",
+ * id = "default",
* title = @Translation("Master"),
* help = @Translation("Default settings for this view."),
* theme = "views_view",
diff --git a/lib/Drupal/views/Plugin/views/display/Embed.php b/lib/Drupal/views/Plugin/views/display/Embed.php
index 2deb5cc1f85165dc0aaa831beab2029ba2511bda..be1512841be69c8714fb6c76c4b121822bbb7835 100644
--- a/lib/Drupal/views/Plugin/views/display/Embed.php
+++ b/lib/Drupal/views/Plugin/views/display/Embed.php
@@ -21,7 +21,7 @@
/**
* @Plugin(
- * plugin_id = "embed",
+ * id = "embed",
* title = @Translation("Embed"),
* help = @Translation("Provide a display which can be embedded using the views api."),
* theme = "views_view",
diff --git a/lib/Drupal/views/Plugin/views/display/Feed.php b/lib/Drupal/views/Plugin/views/display/Feed.php
index e8d2a38f716409bdd576463e33a048dd76e94c77..6bfd130e05abc257ab23abc8ca32ef24a62f7634 100644
--- a/lib/Drupal/views/Plugin/views/display/Feed.php
+++ b/lib/Drupal/views/Plugin/views/display/Feed.php
@@ -21,7 +21,7 @@
/**
* @Plugin(
- * plugin_id = "feed",
+ * id = "feed",
* title = @Translation("Feed"),
* help = @Translation("Display the view as a feed, such as an RSS feed."),
* uses_hook_menu = TRUE,
diff --git a/lib/Drupal/views/Plugin/views/display/Page.php b/lib/Drupal/views/Plugin/views/display/Page.php
index fcc8c342927aafe062a5a0426b8e93939ce16577..16557b1ceab767304dba8643851969f60cb9758f 100644
--- a/lib/Drupal/views/Plugin/views/display/Page.php
+++ b/lib/Drupal/views/Plugin/views/display/Page.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "page",
+ * id = "page",
* title = @Translation("Page"),
* help = @Translation("Display the view as a page, with a URL and menu links."),
* uses_hook_menu = TRUE,
diff --git a/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php b/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
index 5c74d1142bbb0d5086f21624882ef8b669a59613..a33354a6dcbeb2954be0b94ae3c4810fd025b0b5 100644
--- a/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
+++ b/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
@@ -11,7 +11,7 @@
/**
* @Plugin(
- * plugin_id = "default",
+ * id = "default",
* title = @Translation("Empty display extender"),
* help = @Translation("Default settings for this view."),
* enabled = FALSE,
diff --git a/lib/Drupal/views/Plugin/views/exposed_form/Basic.php b/lib/Drupal/views/Plugin/views/exposed_form/Basic.php
index 87d0848be85f268db5d0a8f8d5a5836a7a3d4907..b5c8bdae376b44203a570ca09b8d8de88f00af2d 100644
--- a/lib/Drupal/views/Plugin/views/exposed_form/Basic.php
+++ b/lib/Drupal/views/Plugin/views/exposed_form/Basic.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "basic",
+ * id = "basic",
* title = @Translation("Basic"),
* help = @Translation("Basic exposed form"),
* uses_options = TRUE,
diff --git a/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php b/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
index 7235705c9f02467c72e2299e450b38544c9b08eb..831042fc0a5f2a9faa0a8e354c321ebf30c1ad2b 100644
--- a/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
+++ b/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "input_required",
+ * id = "input_required",
* title = @Translation("Input required"),
* help = @Translation("An exposed form that only renders a view if the form contains user input."),
* uses_options = TRUE,
diff --git a/lib/Drupal/views/Plugin/views/field/Boolean.php b/lib/Drupal/views/Plugin/views/field/Boolean.php
index 96ec7d5628bcc32f77cf3d04b7b00fe46347ab95..fe2de176b8efeb4189fd59b6ec0245e132518f91 100644
--- a/lib/Drupal/views/Plugin/views/field/Boolean.php
+++ b/lib/Drupal/views/Plugin/views/field/Boolean.php
@@ -27,7 +27,7 @@
/**
* @plugin(
- * plugin_id = "boolean"
+ * id = "boolean"
* )
*/
class Boolean extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/Broken.php b/lib/Drupal/views/Plugin/views/field/Broken.php
index f554bf17be0a35689ba96d9ba9013964cfdffede..37f135c2c22f796115ae1d2d5749cde6c5647ccf 100644
--- a/lib/Drupal/views/Plugin/views/field/Broken.php
+++ b/lib/Drupal/views/Plugin/views/field/Broken.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "broken"
+ * id = "broken"
* )
*/
class Broken extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/ContextualLinks.php b/lib/Drupal/views/Plugin/views/field/ContextualLinks.php
index f25ddd7608f7738be713f579052390517942bfaf..c8d964909aab6077aea088204ed7712731ac0fb7 100644
--- a/lib/Drupal/views/Plugin/views/field/ContextualLinks.php
+++ b/lib/Drupal/views/Plugin/views/field/ContextualLinks.php
@@ -17,7 +17,7 @@
/**
* @plugin(
- * plugin_id = "contextual_links"
+ * id = "contextual_links"
* )
*/
class ContextualLinks extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/Counter.php b/lib/Drupal/views/Plugin/views/field/Counter.php
index 1edefb666bea102ae9ad0b42609521019de10067..e7bfd4c29cbb31395b4e0cadb081cf0577846241 100644
--- a/lib/Drupal/views/Plugin/views/field/Counter.php
+++ b/lib/Drupal/views/Plugin/views/field/Counter.php
@@ -17,7 +17,7 @@
/**
* @plugin(
- * plugin_id = "counter"
+ * id = "counter"
* )
*/
class Counter extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/Custom.php b/lib/Drupal/views/Plugin/views/field/Custom.php
index 53329f8a888bb8796f73c7fa17378d1f189e7cd8..838421508909da39416da6642faa1ca974aefd54 100644
--- a/lib/Drupal/views/Plugin/views/field/Custom.php
+++ b/lib/Drupal/views/Plugin/views/field/Custom.php
@@ -17,7 +17,7 @@
/**
* @plugin(
- * plugin_id = "custom"
+ * id = "custom"
* )
*/
class Custom extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/Date.php b/lib/Drupal/views/Plugin/views/field/Date.php
index 8cbaefeaca706d47b3087a0948b7ba825dc8cb57..7d5e2f78d502b6b9d8450a40a5c6d97fe02c4394 100644
--- a/lib/Drupal/views/Plugin/views/field/Date.php
+++ b/lib/Drupal/views/Plugin/views/field/Date.php
@@ -17,7 +17,7 @@
/**
* @plugin(
- * plugin_id = "date"
+ * id = "date"
* )
*/
class Date extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/Entity.php b/lib/Drupal/views/Plugin/views/field/Entity.php
index 333f0f13b2ffb9eecffddad57e3e6c70d4615068..f12a16ba98531938fb54ee9e0b94f7b59eace102 100644
--- a/lib/Drupal/views/Plugin/views/field/Entity.php
+++ b/lib/Drupal/views/Plugin/views/field/Entity.php
@@ -23,7 +23,7 @@
/**
* @plugin(
- * plugin_id = "entity"
+ * id = "entity"
* )
*/
class Entity extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index da86d5b0442f0b7d90b4c9d0eb291f9c58a09a69..f847fd04de40900e58bcf7dd2e5a24e5e6659ad6 100644
--- a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -50,7 +50,7 @@
/**
* @plugin(
- * plugin_id = "standard"
+ * id = "standard"
* )
*/
class FieldPluginBase extends Handler {
diff --git a/lib/Drupal/views/Plugin/views/field/FileSize.php b/lib/Drupal/views/Plugin/views/field/FileSize.php
index 14244922c0b7ea094a82619d114a3054a5a8c424..79bab19fc06653a2202ced294021bb8d4d58b052 100644
--- a/lib/Drupal/views/Plugin/views/field/FileSize.php
+++ b/lib/Drupal/views/Plugin/views/field/FileSize.php
@@ -15,7 +15,7 @@
/**
* @plugin(
- * plugin_id = "file_size"
+ * id = "file_size"
* )
*/
class FileSize extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/MachineName.php b/lib/Drupal/views/Plugin/views/field/MachineName.php
index a35bf8676a759f8b18a519c932f041f10bb9dd39..ca3ca839a477d217ace86bb30409f73417bab3ee 100644
--- a/lib/Drupal/views/Plugin/views/field/MachineName.php
+++ b/lib/Drupal/views/Plugin/views/field/MachineName.php
@@ -20,7 +20,7 @@
/**
* @plugin(
- * plugin_id = "machine_name"
+ * id = "machine_name"
* )
*/
class MachineName extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/Markup.php b/lib/Drupal/views/Plugin/views/field/Markup.php
index d18b625466b4b18177c9c4f558ba57dbab0b954a..003eb92c9968118f12e46cb15d898db71bc73551 100644
--- a/lib/Drupal/views/Plugin/views/field/Markup.php
+++ b/lib/Drupal/views/Plugin/views/field/Markup.php
@@ -23,7 +23,7 @@
/**
* @plugin(
- * plugin_id = "markup"
+ * id = "markup"
* )
*/
class Markup extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/Math.php b/lib/Drupal/views/Plugin/views/field/Math.php
index dc1c40ab651ed2cfc15192b26424bf79a4fba657..684b9b195e7532f9f7f88e3d6daf719ded901cee 100644
--- a/lib/Drupal/views/Plugin/views/field/Math.php
+++ b/lib/Drupal/views/Plugin/views/field/Math.php
@@ -21,7 +21,7 @@
/**
* @plugin(
- * plugin_id = "math"
+ * id = "math"
* )
*/
class Math extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/Numeric.php b/lib/Drupal/views/Plugin/views/field/Numeric.php
index 69ca4f4c478f0ec7c9be261c84088c3f3ca5bcd4..b769f94f215c0dcd307f141deebf57ed606cf317 100644
--- a/lib/Drupal/views/Plugin/views/field/Numeric.php
+++ b/lib/Drupal/views/Plugin/views/field/Numeric.php
@@ -21,7 +21,7 @@
/**
* @plugin(
- * plugin_id = "numeric"
+ * id = "numeric"
* )
*/
class Numeric extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/PrerenderList.php b/lib/Drupal/views/Plugin/views/field/PrerenderList.php
index 11193ca7bb8d76dffbf8036d608f4f1af88c6dfd..061efce970e05e602c2b5de26e93e159c223feca 100644
--- a/lib/Drupal/views/Plugin/views/field/PrerenderList.php
+++ b/lib/Drupal/views/Plugin/views/field/PrerenderList.php
@@ -22,7 +22,7 @@
/**
* @plugin(
- * plugin_id = "prerender_list"
+ * id = "prerender_list"
* )
*/
class PrerenderList extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/Serialized.php b/lib/Drupal/views/Plugin/views/field/Serialized.php
index 83a09224c998eae8796fef1ba6ea668f0ff0b46c..4d2487401ed901654f92bb64c5c5e611a8790bd4 100644
--- a/lib/Drupal/views/Plugin/views/field/Serialized.php
+++ b/lib/Drupal/views/Plugin/views/field/Serialized.php
@@ -17,7 +17,7 @@
/**
* @plugin(
- * plugin_id = "serialized"
+ * id = "serialized"
* )
*/
class Serialized extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/TimeInterval.php b/lib/Drupal/views/Plugin/views/field/TimeInterval.php
index f0d8698e8ebb7c1de4acd5a6e84bbd6d65d3c5b5..886c559632eb345936ac1fdce47116be65c3aa6d 100644
--- a/lib/Drupal/views/Plugin/views/field/TimeInterval.php
+++ b/lib/Drupal/views/Plugin/views/field/TimeInterval.php
@@ -17,7 +17,7 @@
/**
* @plugin(
- * plugin_id = "time_interval"
+ * id = "time_interval"
* )
*/
class TimeInterval extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/Url.php b/lib/Drupal/views/Plugin/views/field/Url.php
index d492dfb718456e61e2f5836bf44228e4ab8a169d..9e3bd6f62efdd09d0747024795e3c99b64f38bb1 100644
--- a/lib/Drupal/views/Plugin/views/field/Url.php
+++ b/lib/Drupal/views/Plugin/views/field/Url.php
@@ -17,7 +17,7 @@
/**
* @plugin(
- * plugin_id = "url"
+ * id = "url"
* )
*/
class Url extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/field/Xss.php b/lib/Drupal/views/Plugin/views/field/Xss.php
index 896a90e9d1da143cc14cc142a4685cdcfa529c9c..316cd8dbdf494dcfa3277f85ae7d147600ab008a 100644
--- a/lib/Drupal/views/Plugin/views/field/Xss.php
+++ b/lib/Drupal/views/Plugin/views/field/Xss.php
@@ -16,7 +16,7 @@
/**
* @plugin(
- * plugin_id = "xss"
+ * id = "xss"
* )
*/
class Xss extends FieldPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php b/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
index a69d0e72907c882f81280f49e64dbed3959b6f6c..8b74532a89abf0b5dd627140649330946d038eef 100644
--- a/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
+++ b/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
@@ -28,7 +28,7 @@
/**
* @plugin(
- * plugin_id = "boolean"
+ * id = "boolean"
* )
*/
class BooleanOperator extends FilterPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php b/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
index 29f7d40353a492220fb8b5c1dbcd219ce7481536..5838e449f13501cb3e31d72866e202a18d8c0515 100644
--- a/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
+++ b/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
@@ -23,7 +23,7 @@
/**
* @Plugin(
- * plugin_id = "boolean_string"
+ * id = "boolean_string"
* )
*/
class BooleanOperatorString extends BooleanOperator {
diff --git a/lib/Drupal/views/Plugin/views/filter/Broken.php b/lib/Drupal/views/Plugin/views/filter/Broken.php
index ff38ea38d149ef9ed9c8d7219b27a1e1b7ee9ffa..a9bf22cbd10dbb14c46533603d857027f87328d1 100644
--- a/lib/Drupal/views/Plugin/views/filter/Broken.php
+++ b/lib/Drupal/views/Plugin/views/filter/Broken.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "broken"
+ * id = "broken"
* )
*/
class Broken extends FilterPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/filter/Combine.php b/lib/Drupal/views/Plugin/views/filter/Combine.php
index 8b56c7b88fe9f3a2496d819d3868f557e8aa44f3..d5fe0890ca5a1156f294c6d13a3e94e1e163b7da 100644
--- a/lib/Drupal/views/Plugin/views/filter/Combine.php
+++ b/lib/Drupal/views/Plugin/views/filter/Combine.php
@@ -17,7 +17,7 @@
/**
* @plugin(
- * plugin_id = "combine"
+ * id = "combine"
* )
*/
class Combine extends String {
diff --git a/lib/Drupal/views/Plugin/views/filter/Date.php b/lib/Drupal/views/Plugin/views/filter/Date.php
index 81843892ad41e8965de677273284d3cc47042b71..ddc3ad06c44c7fec1edd64a38b9a32eaef6acc1c 100644
--- a/lib/Drupal/views/Plugin/views/filter/Date.php
+++ b/lib/Drupal/views/Plugin/views/filter/Date.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "date"
+ * id = "date"
* )
*/
class Date extends Numeric {
diff --git a/lib/Drupal/views/Plugin/views/filter/Equality.php b/lib/Drupal/views/Plugin/views/filter/Equality.php
index 9344519bae77039be55cfbf49873ecc000d1de76..b21a39e538fd88a6cd44a301e7418d541f14712b 100644
--- a/lib/Drupal/views/Plugin/views/filter/Equality.php
+++ b/lib/Drupal/views/Plugin/views/filter/Equality.php
@@ -17,7 +17,7 @@
/**
* @plugin(
- * plugin_id = "equality"
+ * id = "equality"
* )
*/
class Equality extends FilterPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index de2c4803d60b1495e84a4d2019b72f6b08204d20..47b686ae45dcbb86ec358fc44f6acbf192ba85e8 100644
--- a/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -39,7 +39,7 @@
/**
* @Plugin(
- * plugin_id = "standard"
+ * id = "standard"
* )
*/
class FilterPluginBase extends Handler {
diff --git a/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php b/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
index 1f486d6f09f6f0d0d9cbd8eec75e692926db07f0..bdd84bb374e9a1906567978fa8df77a6f99e6651 100644
--- a/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
+++ b/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
@@ -17,7 +17,7 @@
/**
* @plugin(
- * plugin_id = "groupby_numeric"
+ * id = "groupby_numeric"
* )
*/
class GroupByNumeric extends Numeric {
diff --git a/lib/Drupal/views/Plugin/views/filter/InOperator.php b/lib/Drupal/views/Plugin/views/filter/InOperator.php
index c3e8d316b5cd132391a0002f8df322ab1363ec84..cef4c9c9c7cc8d13e82439c2d776e8cb2ba78fc3 100644
--- a/lib/Drupal/views/Plugin/views/filter/InOperator.php
+++ b/lib/Drupal/views/Plugin/views/filter/InOperator.php
@@ -21,7 +21,7 @@
/**
* @plugin(
- * plugin_id = "in_operator"
+ * id = "in_operator"
* )
*/
class InOperator extends FilterPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/filter/ManyToOne.php b/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
index 077fc0fa8c11540b452bc1a623429f2d0d328a79..531e303261bda9ad34ae0966c0bba65c6751893a 100644
--- a/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
+++ b/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
@@ -23,7 +23,7 @@
/**
* @plugin(
- * plugin_id = "many_to_one"
+ * id = "many_to_one"
* )
*/
class ManyToOne extends InOperator {
diff --git a/lib/Drupal/views/Plugin/views/filter/Numeric.php b/lib/Drupal/views/Plugin/views/filter/Numeric.php
index 1ddcea24843c9278159c8a00410197d5caf4d0a0..427c677a231c0531a9e060e3b2e8193d79392699 100644
--- a/lib/Drupal/views/Plugin/views/filter/Numeric.php
+++ b/lib/Drupal/views/Plugin/views/filter/Numeric.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "numeric"
+ * id = "numeric"
* )
*/
class Numeric extends FilterPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/filter/String.php b/lib/Drupal/views/Plugin/views/filter/String.php
index 8c2ff03e6116befe36fd6ffb5781651774537c7e..3ce7479ef1256480ed069d0f78b77988d7e3f2ad 100644
--- a/lib/Drupal/views/Plugin/views/filter/String.php
+++ b/lib/Drupal/views/Plugin/views/filter/String.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "string"
+ * id = "string"
* )
*/
class String extends FilterPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/localization/Core.php b/lib/Drupal/views/Plugin/views/localization/Core.php
index 080a6c153a75e4482119f557ea198f6ad1770e0a..58f929fef481a600f9f704d94f26680f8f5d2e47 100644
--- a/lib/Drupal/views/Plugin/views/localization/Core.php
+++ b/lib/Drupal/views/Plugin/views/localization/Core.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "core",
+ * id = "core",
* title = @Translation("Core"),
* help = @Translation("Use Drupal core t() function. Not recommended, as it doesn't support updates to existing strings."),
* help_topic = "localization-core"
diff --git a/lib/Drupal/views/Plugin/views/localization/None.php b/lib/Drupal/views/Plugin/views/localization/None.php
index 2c04b23a271026d1c9952794d0bc7f6e87219ed3..300ab4f94a5a35a892c356525930d675724c7341 100644
--- a/lib/Drupal/views/Plugin/views/localization/None.php
+++ b/lib/Drupal/views/Plugin/views/localization/None.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "none",
+ * id = "none",
* title = @Translation("None"),
* help = @Translation("Do not pass admin strings for translation."),
* help_topic = "localization-none"
diff --git a/lib/Drupal/views/Plugin/views/pager/Full.php b/lib/Drupal/views/Plugin/views/pager/Full.php
index cf7f888398b4f259c4da348f3b346a6bdaee2e97..0f58093b06f44f9895e1e3235c5133b63d20e981 100644
--- a/lib/Drupal/views/Plugin/views/pager/Full.php
+++ b/lib/Drupal/views/Plugin/views/pager/Full.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "full",
+ * id = "full",
* title = @Translation("Paged output, full pager"),
* short_title = @Translation("Full"),
* help = @Translation("Paged output, full Drupal style"),
diff --git a/lib/Drupal/views/Plugin/views/pager/Mini.php b/lib/Drupal/views/Plugin/views/pager/Mini.php
index 180d03127da220d25ae3c10157e16a1ee97baa81..b68ba1adcb49d0c88a6819a4d6315679a7fe5e37 100644
--- a/lib/Drupal/views/Plugin/views/pager/Mini.php
+++ b/lib/Drupal/views/Plugin/views/pager/Mini.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "mini",
+ * id = "mini",
* title = @Translation("Paged output, mini pager"),
* short_title = @Translation("Mini"),
* help = @Translation("Use the mini pager output."),
diff --git a/lib/Drupal/views/Plugin/views/pager/None.php b/lib/Drupal/views/Plugin/views/pager/None.php
index f4fa24c95e7df1e36c75be2ef783c0067fd2e595..9994071767981b090ae416612fa7291432ef5c47 100644
--- a/lib/Drupal/views/Plugin/views/pager/None.php
+++ b/lib/Drupal/views/Plugin/views/pager/None.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "none",
+ * id = "none",
* title = @Translation("Display all items"),
* help = @Translation("Display all items that this view might find."),
* help_topic = "pager-none",
diff --git a/lib/Drupal/views/Plugin/views/pager/Some.php b/lib/Drupal/views/Plugin/views/pager/Some.php
index 8aabd3417880f964a15b9723c174528bdf79fe6d..61de7d48bd30f9eb573327f1b335e012837f48cd 100644
--- a/lib/Drupal/views/Plugin/views/pager/Some.php
+++ b/lib/Drupal/views/Plugin/views/pager/Some.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "some",
+ * id = "some",
* title = @Translation("Display a specified number of items"),
* help = @Translation("Display a limited number items that this view might find."),
* help_topic = "pager-some",
diff --git a/lib/Drupal/views/Plugin/views/query/Sql.php b/lib/Drupal/views/Plugin/views/query/Sql.php
index cdc4423b919b1fbf1c16ca4c1f4a6471ac204053..1a83d0a8f973595bee38428ade664b5e37adb9ad 100644
--- a/lib/Drupal/views/Plugin/views/query/Sql.php
+++ b/lib/Drupal/views/Plugin/views/query/Sql.php
@@ -15,7 +15,7 @@
/**
* @Plugin(
- * plugin_id = "views_query",
+ * id = "views_query",
* title = @Translation("SQL Query"),
* help = @Translation("Query will be generated and run using the Drupal database API.")
* )
diff --git a/lib/Drupal/views/Plugin/views/relationship/Broken.php b/lib/Drupal/views/Plugin/views/relationship/Broken.php
index eb9f23f2bdd0cf9c584f884dbb43f8bb7d71299d..8102d10ee83cb9c4054f7eeed217432ba3b26139 100644
--- a/lib/Drupal/views/Plugin/views/relationship/Broken.php
+++ b/lib/Drupal/views/Plugin/views/relationship/Broken.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "broken"
+ * id = "broken"
* )
*/
class Broken extends RelationshipPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php b/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
index c883a3aa762aceb1264b878011cefb86f8e663fa..03876ad38a6253f9af784591aec4b106565c7792 100644
--- a/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
+++ b/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
@@ -63,7 +63,7 @@
/**
* @plugin(
- * plugin_id = "groupwise_max"
+ * id = "groupwise_max"
* )
*/
class GroupwiseMax extends RelationshipPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php b/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
index 4be407a96ea18dc933855415dad4e0d608f5c2a8..2b72b4ac7afa6722cf540aafb0311d66ae4cde7c 100644
--- a/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
@@ -44,7 +44,7 @@
/**
* @Plugin(
- * plugin_id = "standard"
+ * id = "standard"
* )
*/
class RelationshipPluginBase extends Handler {
diff --git a/lib/Drupal/views/Plugin/views/row/Fields.php b/lib/Drupal/views/Plugin/views/row/Fields.php
index ca968ea937300e2a4fc3094e4dee862afa1fbce6..b0b8d78aa8d98c604c6a720cbdf5323fe56bf65c 100644
--- a/lib/Drupal/views/Plugin/views/row/Fields.php
+++ b/lib/Drupal/views/Plugin/views/row/Fields.php
@@ -21,7 +21,7 @@
/**
* @Plugin(
- * plugin_id = "fields",
+ * id = "fields",
* title = @Translation("Fields"),
* help = @Translation("Displays the fields with an optional template."),
* theme = "views_view_fields",
diff --git a/lib/Drupal/views/Plugin/views/row/RssFields.php b/lib/Drupal/views/Plugin/views/row/RssFields.php
index 437c6186c16052cc294e7405714df538520ada8f..d9e4129734c9b4a1d1cae83a3347000b695c4878 100644
--- a/lib/Drupal/views/Plugin/views/row/RssFields.php
+++ b/lib/Drupal/views/Plugin/views/row/RssFields.php
@@ -16,7 +16,7 @@
/**
* @Plugin(
- * plugin_id = "rss_fields",
+ * id = "rss_fields",
* title = @Translation("Fields"),
* help = @Translation("Display fields as RSS items."),
* theme = "views_view_row_rss",
diff --git a/lib/Drupal/views/Plugin/views/sort/Broken.php b/lib/Drupal/views/Plugin/views/sort/Broken.php
index 3ffbb3bfacbd06eb5821feb2af00169be21c71d5..67723300ec4c75ee369406e9dfb4177071c39954 100644
--- a/lib/Drupal/views/Plugin/views/sort/Broken.php
+++ b/lib/Drupal/views/Plugin/views/sort/Broken.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "broken"
+ * id = "broken"
* )
*/
class Broken extends SortPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/sort/Date.php b/lib/Drupal/views/Plugin/views/sort/Date.php
index a1b27eb46a69f326dff3b826618374fdb70e9be8..f972030de5af871485775bd4961113778324855d 100644
--- a/lib/Drupal/views/Plugin/views/sort/Date.php
+++ b/lib/Drupal/views/Plugin/views/sort/Date.php
@@ -16,7 +16,7 @@
* equivalent based upon nearness.
*
* @Plugin(
- * plugin_id = "date"
+ * id = "date"
* )
*
*/
diff --git a/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php b/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
index 40997b327fa1643ce9e2fc7a0b2025c4f9f80cce..50b1f40e8f4c30725aa6e5b33020eaadfed2aafb 100644
--- a/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
+++ b/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
@@ -13,7 +13,7 @@
* Handler for GROUP BY on simple numeric fields.
*
* @Plugin(
- * plugin_id = "groupby_numeric"
+ * id = "groupby_numeric"
* )
*/
class GroupByNumeric extends SortPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php b/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
index a9b0b0b929fa0c5a424d8cac7adbab95533aa5ae..3c196ac2ea1e0540026b77a1f2ac880224d83fd9 100644
--- a/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
+++ b/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
@@ -21,7 +21,7 @@
* This is only really useful for the {menu_links} table.
*
* @Plugin(
- * plugin_id = "menu_hierarchy"
+ * id = "menu_hierarchy"
* )
*/
class MenuHierarchy extends SortPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/sort/Random.php b/lib/Drupal/views/Plugin/views/sort/Random.php
index 3cd8b1495370efcb3898729735a645d4d7f1af5e..a8a818b0c0969d642b2b99f4d60db991e6e7bba7 100644
--- a/lib/Drupal/views/Plugin/views/sort/Random.php
+++ b/lib/Drupal/views/Plugin/views/sort/Random.php
@@ -13,7 +13,7 @@
* Handle a random sort.
*
* @Plugin(
- * plugin_id = "random"
+ * id = "random"
* )
*/
class Random extends SortPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php b/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
index fec0ec1aea3469df469cf28117adec023bb0471d..42ae291ee19658f74105a65c130dd9e225385e1e 100644
--- a/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
@@ -25,7 +25,7 @@
/**
* @Plugin(
- * plugin_id = "standard"
+ * id = "standard"
* )
*/
class SortPluginBase extends Handler {
diff --git a/lib/Drupal/views/Plugin/views/style/DefaultStyle.php b/lib/Drupal/views/Plugin/views/style/DefaultStyle.php
index 73755ae80a7d5722bf298976bae0d55343566202..f21a78bbdda3d28b67dbd602f9e3535946be7e2d 100644
--- a/lib/Drupal/views/Plugin/views/style/DefaultStyle.php
+++ b/lib/Drupal/views/Plugin/views/style/DefaultStyle.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "default",
+ * id = "default",
* title = @Translation("Unformatted list"),
* help = @Translation("Displays rows one after another."),
* theme = "views_view_unformatted",
diff --git a/lib/Drupal/views/Plugin/views/style/DefaultSummary.php b/lib/Drupal/views/Plugin/views/style/DefaultSummary.php
index 63ed0d17420ad1600120537a42234804f49facbc..1830cbc2ae97a4738fd4d80f58ac150dcfca4646 100644
--- a/lib/Drupal/views/Plugin/views/style/DefaultSummary.php
+++ b/lib/Drupal/views/Plugin/views/style/DefaultSummary.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "default_summary",
+ * id = "default_summary",
* title = @Translation("List"),
* help = @Translation("Displays the default summary as a list."),
* theme = "views_view_summary",
diff --git a/lib/Drupal/views/Plugin/views/style/Grid.php b/lib/Drupal/views/Plugin/views/style/Grid.php
index aa633c58ab9804750d25384f6ee43e9058346e07..e68049744b4b2e5d45a0758564c411c806f30a48 100644
--- a/lib/Drupal/views/Plugin/views/style/Grid.php
+++ b/lib/Drupal/views/Plugin/views/style/Grid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "grid",
+ * id = "grid",
* title = @Translation("Grid"),
* help = @Translation("Displays rows in a grid."),
* theme = "views_view_grid",
diff --git a/lib/Drupal/views/Plugin/views/style/HtmlList.php b/lib/Drupal/views/Plugin/views/style/HtmlList.php
index a0a726ba02a4e7975c74dd722099ab10f6cc076d..9c15f6578ead398581d3b00bfc9797fdb7dba812 100644
--- a/lib/Drupal/views/Plugin/views/style/HtmlList.php
+++ b/lib/Drupal/views/Plugin/views/style/HtmlList.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "html_list",
+ * id = "html_list",
* title = @Translation("HTML List"),
* help = @Translation("Displays rows as HTML list."),
* theme = "views_view_list",
diff --git a/lib/Drupal/views/Plugin/views/style/JumpMenu.php b/lib/Drupal/views/Plugin/views/style/JumpMenu.php
index 872857c543949479a6e9d18e31661d910e41dee1..d26690f3e135b3e471748ed2e159984432b7a048 100644
--- a/lib/Drupal/views/Plugin/views/style/JumpMenu.php
+++ b/lib/Drupal/views/Plugin/views/style/JumpMenu.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "jump_menu",
+ * id = "jump_menu",
* title = @Translation("Jump menu"),
* help = @Translation("Puts all of the results into a select box and allows the user to go to a different page based upon the results."),
* theme = "views_view_jump_menu",
diff --git a/lib/Drupal/views/Plugin/views/style/JumpMenuSummary.php b/lib/Drupal/views/Plugin/views/style/JumpMenuSummary.php
index e3a4bf185102845fc426f9b082c2452b67028e88..4b5ddf408f9a807579161ac63a272ebb5aa25c36 100644
--- a/lib/Drupal/views/Plugin/views/style/JumpMenuSummary.php
+++ b/lib/Drupal/views/Plugin/views/style/JumpMenuSummary.php
@@ -17,7 +17,7 @@
*/
/**
* @Plugin(
- * plugin_id = "jump_menu_summary",
+ * id = "jump_menu_summary",
* title = @Translation("Jump menu"),
* help = @Translation("Puts all of the results into a select box and allows the user to go to a different page based upon the results."),
* theme = "views_view_summary_jump_menu",
diff --git a/lib/Drupal/views/Plugin/views/style/Rss.php b/lib/Drupal/views/Plugin/views/style/Rss.php
index 78406c44ecfd62274bf6f997d03268ebdcdc945d..22da6289bda4f90722eda76bb7444d32a4b8500a 100644
--- a/lib/Drupal/views/Plugin/views/style/Rss.php
+++ b/lib/Drupal/views/Plugin/views/style/Rss.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "rss",
+ * id = "rss",
* title = @Translation("RSS Feed"),
* help = @Translation("Generates an RSS feed from a view."),
* theme = "views_view_rss",
diff --git a/lib/Drupal/views/Plugin/views/style/Table.php b/lib/Drupal/views/Plugin/views/style/Table.php
index 95f7d418fabff792d728abfbdba854db3e6a1686..29b6b9c320d2aceeb5fdd17a33d4625ef1acaf3c 100644
--- a/lib/Drupal/views/Plugin/views/style/Table.php
+++ b/lib/Drupal/views/Plugin/views/style/Table.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "table",
+ * id = "table",
* title = @Translation("Table"),
* help = @Translation("Displays rows in a table."),
* theme = "views_view_table",
diff --git a/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php b/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php
index b82d5443b50e5f70165761a3a3f8cbcc1095e171..c96dc3fd382203968e760f75289078aa92aa9991 100644
--- a/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php
+++ b/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "unformatted_summary",
+ * id = "unformatted_summary",
* title = @Translation("Unformatted"),
* help = @Translation("Displays the summary unformatted, with option for one after another or inline."),
* theme = "views_view_summary_unformatted",
diff --git a/lib/Drupal/views/Plugin/views/wizard/Comment.php b/lib/Drupal/views/Plugin/views/wizard/Comment.php
index 9d67a1aab902646239d886afd823b37d81c2d70c..2861b19b84ab53818336bbc40dd820484b467a53 100644
--- a/lib/Drupal/views/Plugin/views/wizard/Comment.php
+++ b/lib/Drupal/views/Plugin/views/wizard/Comment.php
@@ -19,7 +19,7 @@
* Tests creating comment views with the wizard.
*
* @Plugin(
- * plugin_id = "comment",
+ * id = "comment",
* base_table = "comment",
* created_column = "created",
* title = @Translation("Comments"),
diff --git a/lib/Drupal/views/Plugin/views/wizard/File.php b/lib/Drupal/views/Plugin/views/wizard/File.php
index 12e878187886756c544b650e2176962d7e7563b8..c26a4a36c43334202ddb058f2a27c8bc979379f7 100644
--- a/lib/Drupal/views/Plugin/views/wizard/File.php
+++ b/lib/Drupal/views/Plugin/views/wizard/File.php
@@ -15,7 +15,7 @@
* Tests creating managed files views with the wizard.
*
* @Plugin(
- * plugin_id = "file_managed",
+ * id = "file_managed",
* base_table = "file_managed",
* created_column = "timestamp",
* title = @Translation("Files"),
diff --git a/lib/Drupal/views/Plugin/views/wizard/Node.php b/lib/Drupal/views/Plugin/views/wizard/Node.php
index 8ba1886d07281ca2d186c2b01597fe30d96a912c..2a75a07558c20b7f76e216bfc66adfa6992b0c0d 100644
--- a/lib/Drupal/views/Plugin/views/wizard/Node.php
+++ b/lib/Drupal/views/Plugin/views/wizard/Node.php
@@ -19,7 +19,7 @@
* Tests creating node views with the wizard.
*
* @Plugin(
- * plugin_id = "node",
+ * id = "node",
* base_table = "node",
* created_column = "created",
* title = @Translation("Content"),
diff --git a/lib/Drupal/views/Plugin/views/wizard/NodeRevision.php b/lib/Drupal/views/Plugin/views/wizard/NodeRevision.php
index b3e2bbc7c63b791d431d2098614a0f106a508772..a01a9c46cc3de41d047638c55ee9ae994703ea0a 100644
--- a/lib/Drupal/views/Plugin/views/wizard/NodeRevision.php
+++ b/lib/Drupal/views/Plugin/views/wizard/NodeRevision.php
@@ -19,7 +19,7 @@
* Tests creating node revision views with the wizard.
*
* @Plugin(
- * plugin_id = "node_revision",
+ * id = "node_revision",
* base_table = "node_revision",
* created_column = "timestamp",
* title = @Translation("Content revisions"),
diff --git a/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php b/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
index 59392ead4ff1ad50ef2ba89c515a8a4801e5fdf4..295c1877f3ef63ec17b9db7ce4d4fa804351d57d 100644
--- a/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
+++ b/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
@@ -15,7 +15,7 @@
* Tests creating taxonomy views with the wizard.
*
* @Plugin(
- * plugin_id = "taxonomy_term",
+ * id = "taxonomy_term",
* base_table = "taxonomy_term_data",
* title = @Translation("Taxonomy terms"),
* path_field = {
diff --git a/lib/Drupal/views/Plugin/views/wizard/Users.php b/lib/Drupal/views/Plugin/views/wizard/Users.php
index 317dc607c5d5e6c0b6b427f1371a654034343f11..e103290a0cee0353a74f516e292dc8f3fa7d5f8d 100644
--- a/lib/Drupal/views/Plugin/views/wizard/Users.php
+++ b/lib/Drupal/views/Plugin/views/wizard/Users.php
@@ -19,7 +19,7 @@
* Tests creating user views with the wizard.
*
* @Plugin(
- * plugin_id = "users",
+ * id = "users",
* base_table = "users",
* created_column = "created",
* title = @Translation("Users"),
diff --git a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 9bbe4971833bd53c25dae9fe84bdd788dd6ccaf4..af3091f479d9dd39d86c60659447eb27264d3955 100644
--- a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -672,7 +672,7 @@ protected function default_display_filters_user($form, $form_state) {
$table_data = views_fetch_data($table);
// Check whether the bundle key filter handler is or an child of it in_operator
// If it's not just use a single value instead of an array.
- $handler = $table_data[$bundle_key]['filter']['plugin_id'];
+ $handler = $table_data[$bundle_key]['filter']['id'];
if ($handler == 'in_operator' || is_subclass_of($handler, 'in_operator')) {
$value = drupal_map_assoc(array($form_state['values']['show']['type']));
}
diff --git a/lib/Drupal/views/Tests/ViewsSqlTest.php b/lib/Drupal/views/Tests/ViewsSqlTest.php
index d2a0ac06fd3d59848c5d23e95635e0667a91f9b5..d2a0f962c8e1b1f24fdc060e5bc0468ae8be526b 100644
--- a/lib/Drupal/views/Tests/ViewsSqlTest.php
+++ b/lib/Drupal/views/Tests/ViewsSqlTest.php
@@ -121,85 +121,85 @@ protected function viewsData() {
'title' => t('ID'),
'help' => t('The test data ID'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
$data['views_test']['name'] = array(
'title' => t('Name'),
'help' => t('The name of the person'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
$data['views_test']['age'] = array(
'title' => t('Age'),
'help' => t('The age of the person'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
$data['views_test']['job'] = array(
'title' => t('Job'),
'help' => t('The job of the person'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
$data['views_test']['created'] = array(
'title' => t('Created'),
'help' => t('The creation date of this record'),
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
'sort' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
return $data;
diff --git a/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php b/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php
index 745a881925cd5b1d960efdfe519266b69fc3be41..85cdcecf770fc837f5fa444b15c043759524c6bb 100644
--- a/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php
+++ b/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "aggregator_category_cid"
+ * id = "aggregator_category_cid"
* )
*/
class CategoryCid extends Numeric {
diff --git a/lib/Views/aggregator/Plugin/views/argument/Fid.php b/lib/Views/aggregator/Plugin/views/argument/Fid.php
index ede22115390879988e80220e93c2ebb645293345..7cfbd9b1254f777ebc4d01c4bc2023605be52bf3 100644
--- a/lib/Views/aggregator/Plugin/views/argument/Fid.php
+++ b/lib/Views/aggregator/Plugin/views/argument/Fid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "aggregator_fid"
+ * id = "aggregator_fid"
* )
*/
class Fid extends Numeric {
diff --git a/lib/Views/aggregator/Plugin/views/argument/Iid.php b/lib/Views/aggregator/Plugin/views/argument/Iid.php
index 5a311929d8aecb09e132756e58155a6a029c9ca8..576e4b51e5d0221f9634240f23b358e4d7af10fc 100644
--- a/lib/Views/aggregator/Plugin/views/argument/Iid.php
+++ b/lib/Views/aggregator/Plugin/views/argument/Iid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "aggregator_iid"
+ * id = "aggregator_iid"
* )
*/
class Iid extends Numeric {
diff --git a/lib/Views/aggregator/Plugin/views/field/Category.php b/lib/Views/aggregator/Plugin/views/field/Category.php
index eff1875e28a41497f2b4c87a61d59cb715f40ee0..b181ba37e5f3f85a393d35521395723656aacb2e 100644
--- a/lib/Views/aggregator/Plugin/views/field/Category.php
+++ b/lib/Views/aggregator/Plugin/views/field/Category.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "aggregator_category"
+ * id = "aggregator_category"
* )
*/
class Category extends FieldPluginBase {
diff --git a/lib/Views/aggregator/Plugin/views/field/TitleLink.php b/lib/Views/aggregator/Plugin/views/field/TitleLink.php
index 35e53f0d263578de777a8cf362a9e532d557b32c..d90b80e3e8e27c8bfac5e1a5890aae6ab1ab978e 100644
--- a/lib/Views/aggregator/Plugin/views/field/TitleLink.php
+++ b/lib/Views/aggregator/Plugin/views/field/TitleLink.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "aggregator_title_link"
+ * id = "aggregator_title_link"
* )
*/
class TitleLink extends FieldPluginBase {
diff --git a/lib/Views/aggregator/Plugin/views/field/Xss.php b/lib/Views/aggregator/Plugin/views/field/Xss.php
index 5680ba1ce5b7d5a20544a5aa8572d45f3012672e..358b70a4ecbc045c2641c089a3286b825d591fe2 100644
--- a/lib/Views/aggregator/Plugin/views/field/Xss.php
+++ b/lib/Views/aggregator/Plugin/views/field/Xss.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "aggregator_xss"
+ * id = "aggregator_xss"
* )
*/
class Xss extends FieldPluginBase {
diff --git a/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php b/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
index dec3a576bd9de542fda32c794d97289fe7346f60..5de4e4de77930f4119a9ebc66b318231731372cd 100644
--- a/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
+++ b/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "aggregator_category_cid"
+ * id = "aggregator_category_cid"
* )
*/
class CategoryCid extends InOperator {
diff --git a/lib/Views/aggregator/Plugin/views/row/Rss.php b/lib/Views/aggregator/Plugin/views/row/Rss.php
index 15286d666d20329b969c606ca83540e1834083fc..7dbc2181fe8a9afcae24be81ba83e1a26497366d 100644
--- a/lib/Views/aggregator/Plugin/views/row/Rss.php
+++ b/lib/Views/aggregator/Plugin/views/row/Rss.php
@@ -15,7 +15,7 @@
* Plugin which loads an aggregator item and formats it as an RSS item.
*
* @Plugin(
- * plugin_id = "aggregator_rss",
+ * id = "aggregator_rss",
* theme = "views_view_row_rss",
* title = @Translation("Aggregator item"),
* help = @Translation("Display the aggregator item using the data from the original source."),
diff --git a/lib/Views/book/Plugin/views/argument_default/Root.php b/lib/Views/book/Plugin/views/argument_default/Root.php
index b4213e1560e5f81ae71358650553d070f491154f..6669fa9e58267bb2db76fa8c137123914166d1b1 100644
--- a/lib/Views/book/Plugin/views/argument_default/Root.php
+++ b/lib/Views/book/Plugin/views/argument_default/Root.php
@@ -16,7 +16,7 @@
/**
* @Plugin(
- * plugin_id = "book_root",
+ * id = "book_root",
* title = @Translation("Book root from current node")
* )
*/
diff --git a/lib/Views/comment/Plugin/views/argument/UserUid.php b/lib/Views/comment/Plugin/views/argument/UserUid.php
index 543cfb613a1a66082bec0707c7a5e54d5bfac5bf..c621aaa41f975ce6bb89ba9d5addc4b8d185d5b2 100644
--- a/lib/Views/comment/Plugin/views/argument/UserUid.php
+++ b/lib/Views/comment/Plugin/views/argument/UserUid.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "argument_comment_user_uid"
+ * id = "argument_comment_user_uid"
* )
*/
class UserUid extends ArgumentPluginBase {
diff --git a/lib/Views/comment/Plugin/views/field/Comment.php b/lib/Views/comment/Plugin/views/field/Comment.php
index 9f1ee99aed9c27f40c25bda5f8d9a818d303273f..bcc8c4d3d15c259c866b47d11c837491401280b9 100644
--- a/lib/Views/comment/Plugin/views/field/Comment.php
+++ b/lib/Views/comment/Plugin/views/field/Comment.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "comment"
+ * id = "comment"
* )
*/
class Comment extends FieldPluginBase {
diff --git a/lib/Views/comment/Plugin/views/field/Depth.php b/lib/Views/comment/Plugin/views/field/Depth.php
index 9fc6bab20cc456cd2d084f720a7d31266c5ec4da..60f930cca1ac7971887366be8fe6b1143cd3ef72 100644
--- a/lib/Views/comment/Plugin/views/field/Depth.php
+++ b/lib/Views/comment/Plugin/views/field/Depth.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "comment_depth"
+ * id = "comment_depth"
* )
*/
class Depth extends FieldPluginBase {
diff --git a/lib/Views/comment/Plugin/views/field/LInkDelete.php b/lib/Views/comment/Plugin/views/field/LInkDelete.php
index eb051ddee9ce796aa31bd0212ff9365d9852e529..6f95720105b36fdefb6f01f3345a42afaf25b2f1 100644
--- a/lib/Views/comment/Plugin/views/field/LInkDelete.php
+++ b/lib/Views/comment/Plugin/views/field/LInkDelete.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "comment_link_delete"
+ * id = "comment_link_delete"
* )
*/
class LinkDelete extends Link {
diff --git a/lib/Views/comment/Plugin/views/field/LastTimestamp.php b/lib/Views/comment/Plugin/views/field/LastTimestamp.php
index 69da9dcd61112aaa6054a75dfcd10dbc8fb1eab2..de6b67a02ca9f68aa7e388083a05aba6160d7649 100644
--- a/lib/Views/comment/Plugin/views/field/LastTimestamp.php
+++ b/lib/Views/comment/Plugin/views/field/LastTimestamp.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "comment_last_timestamp"
+ * id = "comment_last_timestamp"
* )
*/
class LastTimestamp extends Date {
diff --git a/lib/Views/comment/Plugin/views/field/Link.php b/lib/Views/comment/Plugin/views/field/Link.php
index 042c3993fbc28a484327a3c20b9f23eb5315afbc..75deb9e9fce0bd60d7fda6953222255300afec90 100644
--- a/lib/Views/comment/Plugin/views/field/Link.php
+++ b/lib/Views/comment/Plugin/views/field/Link.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "comment_link"
+ * id = "comment_link"
* )
*/
class Link extends Entity {
diff --git a/lib/Views/comment/Plugin/views/field/LinkApprove.php b/lib/Views/comment/Plugin/views/field/LinkApprove.php
index 44b41256b48552df50a5f1486d0802bc7eeb5de0..b1a35614f9969b8042ed2bcb736dd91aa13661e4 100644
--- a/lib/Views/comment/Plugin/views/field/LinkApprove.php
+++ b/lib/Views/comment/Plugin/views/field/LinkApprove.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "comment_link_approve"
+ * id = "comment_link_approve"
* )
*/
class LinkApprove extends Link {
diff --git a/lib/Views/comment/Plugin/views/field/LinkEdit.php b/lib/Views/comment/Plugin/views/field/LinkEdit.php
index cca0d62d0d45d2fb7bd94d4b8c50736f20513d15..305cabe81c708dc1be6be7c23c7ddc864ac67b7c 100644
--- a/lib/Views/comment/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/comment/Plugin/views/field/LinkEdit.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "comment_link_edit"
+ * id = "comment_link_edit"
* )
*/
class LinkEdit extends Link {
diff --git a/lib/Views/comment/Plugin/views/field/LinkReply.php b/lib/Views/comment/Plugin/views/field/LinkReply.php
index 70b3d6fedc8452d64ee71eacbc1afd6324d545ce..541d0dc4b79680def92ee97cbde14be98e3b89f8 100644
--- a/lib/Views/comment/Plugin/views/field/LinkReply.php
+++ b/lib/Views/comment/Plugin/views/field/LinkReply.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "comment_link_reply"
+ * id = "comment_link_reply"
* )
*/
class LinkReply extends Link {
diff --git a/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php b/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php
index 2d2c1071ee7365eea69b1dc860d1ef40439fc540..e4ff778ebabb36e4cac26c76f444a8485a704867 100644
--- a/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php
+++ b/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "comment_ncs_last_comment_name"
+ * id = "comment_ncs_last_comment_name"
* )
*/
class NcsLastCommentName extends FieldPluginBase {
diff --git a/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php b/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php
index b7de1f71a085ed40e6f8c0702dbcb7ef5c1b593e..8db994879ebc2e50c219cc2ed015a56a47129934 100644
--- a/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php
+++ b/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "comment_ncs_last_updated"
+ * id = "comment_ncs_last_updated"
* )
*/
class NcsLastUpdated extends Date {
diff --git a/lib/Views/comment/Plugin/views/field/NodeComment.php b/lib/Views/comment/Plugin/views/field/NodeComment.php
index 6fb42b17daeaf5cc9f5d34ce25c2c857d4593cd5..5e9772d8f9aa62a9efb7a774e3cbfc2982f4ab49 100644
--- a/lib/Views/comment/Plugin/views/field/NodeComment.php
+++ b/lib/Views/comment/Plugin/views/field/NodeComment.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_comment"
+ * id = "node_comment"
* )
*/
class NodeComment extends FieldPluginBase {
diff --git a/lib/Views/comment/Plugin/views/field/NodeLink.php b/lib/Views/comment/Plugin/views/field/NodeLink.php
index b970014701528585d8e58b49b7ddbac76012655a..3105c70ea3b76529fd0ed28304c3024f93754738 100644
--- a/lib/Views/comment/Plugin/views/field/NodeLink.php
+++ b/lib/Views/comment/Plugin/views/field/NodeLink.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "comment_node_link"
+ * id = "comment_node_link"
* )
*/
class NodeLink extends Entity {
diff --git a/lib/Views/comment/Plugin/views/field/NodeNewComments.php b/lib/Views/comment/Plugin/views/field/NodeNewComments.php
index 5b63b2edfdae9cf03fad25f0bd73f2adc2d2072e..0dee2203c7c1437d32f39b89f172fe2f42d4f220 100644
--- a/lib/Views/comment/Plugin/views/field/NodeNewComments.php
+++ b/lib/Views/comment/Plugin/views/field/NodeNewComments.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_new_comments"
+ * id = "node_new_comments"
* )
*/
class NodeNewComments extends Numeric {
diff --git a/lib/Views/comment/Plugin/views/field/Username.php b/lib/Views/comment/Plugin/views/field/Username.php
index 0bd43e1f7e7c759f6b18dee10612c0735237046a..e99529d20d00b93c4f5b6a12e090cfb27f17d928 100644
--- a/lib/Views/comment/Plugin/views/field/Username.php
+++ b/lib/Views/comment/Plugin/views/field/Username.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "comment_username"
+ * id = "comment_username"
* )
*/
class Username extends FieldPluginBase {
diff --git a/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php b/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php
index d4efb39cfea48302af796c35c991892f26ea13e9..a3dc9319337e1e37bd73da83b1c52fc8499f5699 100644
--- a/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php
+++ b/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "ncs_last_updated"
+ * id = "ncs_last_updated"
* )
*/
class NcsLastUpdated extends Date {
diff --git a/lib/Views/comment/Plugin/views/filter/NodeComment.php b/lib/Views/comment/Plugin/views/filter/NodeComment.php
index 5cf22ef0f581bf9ffbe5ed47e507cd93e6c52e74..3334edf2ef0657ed11ca70090d54248c0da20bca 100644
--- a/lib/Views/comment/Plugin/views/filter/NodeComment.php
+++ b/lib/Views/comment/Plugin/views/filter/NodeComment.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_comment"
+ * id = "node_comment"
* )
*/
class NodeComment extends InOperator {
diff --git a/lib/Views/comment/Plugin/views/filter/UserUid.php b/lib/Views/comment/Plugin/views/filter/UserUid.php
index 05c54ee0d6cdcd0728cd8c2401a89540a467ca23..ee89746fc5e5faef97aaea8a8a5504c7edb79658 100644
--- a/lib/Views/comment/Plugin/views/filter/UserUid.php
+++ b/lib/Views/comment/Plugin/views/filter/UserUid.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "comment_user_uid"
+ * id = "comment_user_uid"
* )
*/
class UserUid extends FilterPluginBase {
diff --git a/lib/Views/comment/Plugin/views/row/Rss.php b/lib/Views/comment/Plugin/views/row/Rss.php
index 2bc90ff7ef10ab6e5bd0f9f312e3db8bc2f8257c..4e81127e842020f61a8762a24bb420c3dcdf5726 100644
--- a/lib/Views/comment/Plugin/views/row/Rss.php
+++ b/lib/Views/comment/Plugin/views/row/Rss.php
@@ -15,7 +15,7 @@
* Plugin which formats the comments as RSS items.
*
* @Plugin(
- * plugin_id = "comment_rss",
+ * id = "comment_rss",
* title = @Translation("Comment"),
* help = @Translation("Display the comment as RSS."),
* theme = "views_view_row_rss",
diff --git a/lib/Views/comment/Plugin/views/row/View.php b/lib/Views/comment/Plugin/views/row/View.php
index 856fc119b7e2d0f5ba52daa3c11d4b39d1ac5f7f..066188b3c5071f9039c3e867f1e13fae2b7abdd3 100644
--- a/lib/Views/comment/Plugin/views/row/View.php
+++ b/lib/Views/comment/Plugin/views/row/View.php
@@ -15,7 +15,7 @@
* Plugin which performs a comment_view on the resulting object.
*
* @Plugin(
- * plugin_id = "comment_view",
+ * id = "comment_view",
* title = @Translation("Comment"),
* help = @Translation("Display the comment with standard comment view."),
* theme = "views_view_row_comment",
diff --git a/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php b/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php
index e5b6d9fe5ee7a2b623e751bc675f20f83115982f..9d5cc8158e1bd8a23f65b1fa87b472021c3bbbf1 100644
--- a/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php
+++ b/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php
@@ -20,7 +20,7 @@
/**
* @Plugin(
- * plugin_id = "ncs_last_comment_name"
+ * id = "ncs_last_comment_name"
* )
*/
class NcsLastCommentName extends SortPluginBase {
diff --git a/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php b/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php
index bf850dd01b0aca8e3be56bccb50897868dde92e8..a46798e15cb94a8e60caea80f827e629f0405e00 100644
--- a/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php
+++ b/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "ncs_last_updated"
+ * id = "ncs_last_updated"
* )
*/
class NcsLastUpdated extends Date {
diff --git a/lib/Views/comment/Plugin/views/sort/Thread.php b/lib/Views/comment/Plugin/views/sort/Thread.php
index 6bdf70855aea47f679f1481668cbfa238fa5a8fc..8b8e773154907b3e0c12816591ff375c53bdc26d 100644
--- a/lib/Views/comment/Plugin/views/sort/Thread.php
+++ b/lib/Views/comment/Plugin/views/sort/Thread.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "comment_thread"
+ * id = "comment_thread"
* )
*/
class Thread extends SortPluginBase {
diff --git a/lib/Views/contact/Plugin/views/field/ContactLink.php b/lib/Views/contact/Plugin/views/field/ContactLink.php
index eedd30076829dc304286fae02bc421d33d99cd22..a49abdb622f7b1e7a70dc24c56a763ee2c629bb7 100644
--- a/lib/Views/contact/Plugin/views/field/ContactLink.php
+++ b/lib/Views/contact/Plugin/views/field/ContactLink.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "contact_link"
+ * id = "contact_link"
* )
*/
class ContactLink extends Link {
diff --git a/lib/Views/field/Plugin/views/argument/FieldList.php b/lib/Views/field/Plugin/views/argument/FieldList.php
index 7083e8a25538ff0ed73327b2f6f1e04cdbe642ff..efd1377ddf9f8437ff821325a0c4b76abc035dd3 100644
--- a/lib/Views/field/Plugin/views/argument/FieldList.php
+++ b/lib/Views/field/Plugin/views/argument/FieldList.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "field_list"
+ * id = "field_list"
* )
*/
class FieldList extends Numeric {
diff --git a/lib/Views/field/Plugin/views/argument/ListString.php b/lib/Views/field/Plugin/views/argument/ListString.php
index c4a4a772b434b3c196eec1ebfa447d7c89be4e8a..d629644f62e5aa84e1277c69d646772da90cd595 100644
--- a/lib/Views/field/Plugin/views/argument/ListString.php
+++ b/lib/Views/field/Plugin/views/argument/ListString.php
@@ -20,7 +20,7 @@
/**
* @Plugin(
- * plugin_id = "field_list_string"
+ * id = "field_list_string"
* )
*/
class ListString extends String {
diff --git a/lib/Views/field/Plugin/views/field/Field.php b/lib/Views/field/Plugin/views/field/Field.php
index 45dc678ba95458ce1bbabef693b4b35c33936dbc..e54728693df642ef1a512b47d957ffca748c2246 100644
--- a/lib/Views/field/Plugin/views/field/Field.php
+++ b/lib/Views/field/Plugin/views/field/Field.php
@@ -45,7 +45,7 @@ function _field_view_formatter_options($field_type = NULL) {
/**
* @Plugin(
- * plugin_id = "field"
+ * id = "field"
* )
*/
class Field extends FieldPluginBase {
diff --git a/lib/Views/field/Plugin/views/filter/FieldList.php b/lib/Views/field/Plugin/views/filter/FieldList.php
index 9285d3b7588354c2ac9539b93144b4a285bb07eb..523775efe76662e5fd2f2e8371548486e191ecc2 100644
--- a/lib/Views/field/Plugin/views/filter/FieldList.php
+++ b/lib/Views/field/Plugin/views/filter/FieldList.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "field_list"
+ * id = "field_list"
* )
*/
class FieldList extends InOperator {
diff --git a/lib/Views/field/Plugin/views/relationship/EntityReverse.php b/lib/Views/field/Plugin/views/relationship/EntityReverse.php
index b44bedf8ecf69214bf28d824d068fe5e12f4d899..6f5065e8f38a8e8352dd7e0afa2df270f6055bb1 100644
--- a/lib/Views/field/Plugin/views/relationship/EntityReverse.php
+++ b/lib/Views/field/Plugin/views/relationship/EntityReverse.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "entity_reverse"
+ * id = "entity_reverse"
* )
*/
class EntityReverse extends RelationshipPluginBase {
diff --git a/lib/Views/file/Plugin/views/argument/Fid.php b/lib/Views/file/Plugin/views/argument/Fid.php
index 3adf451a926f827ffb6606c12cc330a4a4310abc..8bbca51dbda011736ae90c67e7a0a2b1ab03b59a 100644
--- a/lib/Views/file/Plugin/views/argument/Fid.php
+++ b/lib/Views/file/Plugin/views/argument/Fid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "file_fid"
+ * id = "file_fid"
* )
*/
class Fid extends Numeric {
diff --git a/lib/Views/file/Plugin/views/field/Extension.php b/lib/Views/file/Plugin/views/field/Extension.php
index 88849876d6124153ef8f8672f74cc47de47a11fc..1b2a9150bdd5562c4e7742cbed1d11c7b25f6134 100644
--- a/lib/Views/file/Plugin/views/field/Extension.php
+++ b/lib/Views/file/Plugin/views/field/Extension.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "file_extension"
+ * id = "file_extension"
* )
*/
class Extension extends FieldPluginBase {
diff --git a/lib/Views/file/Plugin/views/field/File.php b/lib/Views/file/Plugin/views/field/File.php
index b61b78dd583322980e5c8e8ba60a86348536695a..58de8b5eddd8aa89d9c6c87d17c49602dc17203f 100644
--- a/lib/Views/file/Plugin/views/field/File.php
+++ b/lib/Views/file/Plugin/views/field/File.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "file"
+ * id = "file"
* )
*/
class File extends FieldPluginBase {
diff --git a/lib/Views/file/Plugin/views/field/FileMime.php b/lib/Views/file/Plugin/views/field/FileMime.php
index 3dd61a8296cd7b79785ff81a7ed2100562e51cef..e503c6746e342ccbfc15b2703e81be0182ccfc7e 100644
--- a/lib/Views/file/Plugin/views/field/FileMime.php
+++ b/lib/Views/file/Plugin/views/field/FileMime.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "file_filemime"
+ * id = "file_filemime"
* )
*/
class FileMime extends File {
diff --git a/lib/Views/file/Plugin/views/field/Status.php b/lib/Views/file/Plugin/views/field/Status.php
index 3ff9ba0d3751e603ef7be79f17c1f14e27fbc104..9ab4e7f5dbabf8904b7d191fa8945c6253994209 100644
--- a/lib/Views/file/Plugin/views/field/Status.php
+++ b/lib/Views/file/Plugin/views/field/Status.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "file_status"
+ * id = "file_status"
* )
*/
class Status extends FieldPluginBase {
diff --git a/lib/Views/file/Plugin/views/field/Uri.php b/lib/Views/file/Plugin/views/field/Uri.php
index 4e8c16b2150010e67197bc723dbccbf0f7bc5933..a1862a4ef378abfb5fdf6fb5703f4131b7dc3796 100644
--- a/lib/Views/file/Plugin/views/field/Uri.php
+++ b/lib/Views/file/Plugin/views/field/Uri.php
@@ -13,7 +13,7 @@
* Field handler to add rendering file paths as file URLs instead of as internal file URIs.
*
* @Plugin(
- * plugin_id = "file_uri"
+ * id = "file_uri"
* )
*/
class Uri extends File {
diff --git a/lib/Views/file/Plugin/views/filter/Status.php b/lib/Views/file/Plugin/views/filter/Status.php
index 425b7fb2b6c232772ffd6b353190bd3952772359..d9de88ae1678e4d89fd6852154d885b847b60af4 100644
--- a/lib/Views/file/Plugin/views/filter/Status.php
+++ b/lib/Views/file/Plugin/views/filter/Status.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "file_status"
+ * id = "file_status"
* )
*/
class Status extends InOperator {
diff --git a/lib/Views/filter/Plugin/views/field/FormatName.php b/lib/Views/filter/Plugin/views/field/FormatName.php
index d77f4f1bbd5d68979371cab52ee4fd8ae3daf50e..0c65ddb212c722b2827f5267ec5c2ce6aaba80f0 100644
--- a/lib/Views/filter/Plugin/views/field/FormatName.php
+++ b/lib/Views/filter/Plugin/views/field/FormatName.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "filter_format_name"
+ * id = "filter_format_name"
* )
*/
class FormatName extends FieldPluginBase {
diff --git a/lib/Views/locale/Plugin/views/argument/Group.php b/lib/Views/locale/Plugin/views/argument/Group.php
index d257152da5b54bfe705272323bc3c340cfc621e2..6cd1ac17ec438a3b20303205b98394db802883c9 100644
--- a/lib/Views/locale/Plugin/views/argument/Group.php
+++ b/lib/Views/locale/Plugin/views/argument/Group.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "locale_group"
+ * id = "locale_group"
* )
*/
class Group extends ArgumentPluginBase {
diff --git a/lib/Views/locale/Plugin/views/argument/Language.php b/lib/Views/locale/Plugin/views/argument/Language.php
index b6c979f03a85d9ae52bb06b24fe8686b0f28b482..808d5ec7838a7f7d2fb4e2f6862d9509930094d1 100644
--- a/lib/Views/locale/Plugin/views/argument/Language.php
+++ b/lib/Views/locale/Plugin/views/argument/Language.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "locale_language"
+ * id = "locale_language"
* )
*/
class Language extends ArgumentPluginBase {
diff --git a/lib/Views/locale/Plugin/views/field/Group.php b/lib/Views/locale/Plugin/views/field/Group.php
index 420e630b5f79e2ac07fa03cc56c2e64db1d054fc..710b8ff0cb5d35684cef2429b3e73bb1b51a66c7 100644
--- a/lib/Views/locale/Plugin/views/field/Group.php
+++ b/lib/Views/locale/Plugin/views/field/Group.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "locale_group"
+ * id = "locale_group"
* )
*/
class Group extends FieldPluginBase {
diff --git a/lib/Views/locale/Plugin/views/field/Language.php b/lib/Views/locale/Plugin/views/field/Language.php
index 1ad05341b87bd92fec32233aa7546191ed35d299..c952d200a27ac1a0a52de706b308f9787077f864 100644
--- a/lib/Views/locale/Plugin/views/field/Language.php
+++ b/lib/Views/locale/Plugin/views/field/Language.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "locale_language"
+ * id = "locale_language"
* )
*/
class Language extends FieldPluginBase {
diff --git a/lib/Views/locale/Plugin/views/field/LinkEdit.php b/lib/Views/locale/Plugin/views/field/LinkEdit.php
index da75127e57966db6a231476531e04ffa9b2ea8cd..5ca8145e4b4f2c1795920068ddd3675c2d305ebc 100644
--- a/lib/Views/locale/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/locale/Plugin/views/field/LinkEdit.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "locale_link_edit"
+ * id = "locale_link_edit"
* )
*/
class LinkEdit extends FieldPluginBase {
diff --git a/lib/Views/locale/Plugin/views/field/NodeLanguage.php b/lib/Views/locale/Plugin/views/field/NodeLanguage.php
index 7e75622e3a006397c296ebe0249144059f61e073..b23fee8af9f1a859d17f48dd920b794e4edfbd62 100644
--- a/lib/Views/locale/Plugin/views/field/NodeLanguage.php
+++ b/lib/Views/locale/Plugin/views/field/NodeLanguage.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_language"
+ * id = "node_language"
* )
*/
class NodeLanguage extends Node {
diff --git a/lib/Views/locale/Plugin/views/filter/Group.php b/lib/Views/locale/Plugin/views/filter/Group.php
index 10a06e7ba8c63703a9c83626ea5e86b4b912470f..943c4f8821cb8e75573bf141701cbe67b0802020 100644
--- a/lib/Views/locale/Plugin/views/filter/Group.php
+++ b/lib/Views/locale/Plugin/views/filter/Group.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "locale_group"
+ * id = "locale_group"
* )
*/
class Group extends InOperator {
diff --git a/lib/Views/locale/Plugin/views/filter/Language.php b/lib/Views/locale/Plugin/views/filter/Language.php
index 7f01044790f52a190bed0172bb94aeb22885827c..72954187661c4c6883ac9d5ee7864540065362e9 100644
--- a/lib/Views/locale/Plugin/views/filter/Language.php
+++ b/lib/Views/locale/Plugin/views/filter/Language.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "locale_language"
+ * id = "locale_language"
* )
*/
class Language extends InOperator {
diff --git a/lib/Views/locale/Plugin/views/filter/NodeLanguage.php b/lib/Views/locale/Plugin/views/filter/NodeLanguage.php
index 1e7944215f1d92e71f71aaf3828da72e13a04db4..075c23cd127f10ca92cc74b0efe2b0c48db3c64e 100644
--- a/lib/Views/locale/Plugin/views/filter/NodeLanguage.php
+++ b/lib/Views/locale/Plugin/views/filter/NodeLanguage.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_language"
+ * id = "node_language"
* )
*/
class NodeLanguage extends InOperator {
diff --git a/lib/Views/locale/Plugin/views/filter/Version.php b/lib/Views/locale/Plugin/views/filter/Version.php
index 8ba99dfc048a34c315ad0fed42f07e5827a10ace..396b50ea1a0204cfd67945f483e0424c250a8e8a 100644
--- a/lib/Views/locale/Plugin/views/filter/Version.php
+++ b/lib/Views/locale/Plugin/views/filter/Version.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "locale_version"
+ * id = "locale_version"
* )
*/
class Version extends InOperator {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedDay.php b/lib/Views/node/Plugin/views/argument/CreatedDay.php
index c196179850022b8ca9596e280fd2ec30374ab4ef..d321dad66ba03f64de05c44163cc246602155818 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedDay.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedDay.php
@@ -11,7 +11,7 @@
/**
* @Plugin(
- * plugin_id = "node_created_day"
+ * id = "node_created_day"
* )
*/
class CreatedDay extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedFullDate.php b/lib/Views/node/Plugin/views/argument/CreatedFullDate.php
index 50daefe40fd50496df43b2357508e060ce45d140..712dd356fb5d2eab1a2e82e502cc943c12f43e32 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedFullDate.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedFullDate.php
@@ -11,7 +11,7 @@
/**
* @Plugin(
- * plugin_id = "node_created_fulldate"
+ * id = "node_created_fulldate"
* )
*/
class CreatedFullDate extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedMonth.php b/lib/Views/node/Plugin/views/argument/CreatedMonth.php
index b9c3cfea8730fb12ff9b1d191a737de68ceeeb19..f4efee4fc68969ffab1dc048e23f0b9bc898953f 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedMonth.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedMonth.php
@@ -11,7 +11,7 @@
/**
* @Plugin(
- * plugin_id = "node_created_month"
+ * id = "node_created_month"
* )
*/
class CreatedMonth extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedWeek.php b/lib/Views/node/Plugin/views/argument/CreatedWeek.php
index d71bc92f9cb03c8dec7cee1161f2ab1a039ff6a0..e9f337e0a799411549f6e61668e8c25fe6b0a26d 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedWeek.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedWeek.php
@@ -11,7 +11,7 @@
/**
* @Plugin(
- * plugin_id = "node_created_week"
+ * id = "node_created_week"
* )
*/
class CreatedWeek extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedYear.php b/lib/Views/node/Plugin/views/argument/CreatedYear.php
index 75e44ab7e6c4782102a5613c9119320c8b914d58..cd1a294eba22071ed9cba8325533c5e8f7029697 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedYear.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedYear.php
@@ -11,7 +11,7 @@
/**
* @Plugin(
- * plugin_id = "node_created_year"
+ * id = "node_created_year"
* )
*/
class CreatedYear extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
index ce28b7856eeddb2f8d7c7ce9541f0bfade61f021..b4ff62a865510050815a321d34ea2890eb0998c8 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
@@ -11,7 +11,7 @@
/**
* @Plugin(
- * plugin_id = "node_created_year_month"
+ * id = "node_created_year_month"
* )
*/
class CreatedYearMonth extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/Language.php b/lib/Views/node/Plugin/views/argument/Language.php
index 8637eff79a4ed2d174211d3fde23753a3f932794..2ac222ead01205f06ce85d4a4e856b26d819a245 100644
--- a/lib/Views/node/Plugin/views/argument/Language.php
+++ b/lib/Views/node/Plugin/views/argument/Language.php
@@ -16,7 +16,7 @@
/**
* @Plugin(
- * plugin_id = "node_language"
+ * id = "node_language"
* )
*/
class Language extends ArgumentPluginBase {
diff --git a/lib/Views/node/Plugin/views/argument/Nid.php b/lib/Views/node/Plugin/views/argument/Nid.php
index 299c0ca6786c96eeadc2a492354205cd5d1b7c43..ed329b4691285e724028b987339ce72c968325f0 100644
--- a/lib/Views/node/Plugin/views/argument/Nid.php
+++ b/lib/Views/node/Plugin/views/argument/Nid.php
@@ -16,7 +16,7 @@
/**
* @Plugin(
- * plugin_id = "node_nid"
+ * id = "node_nid"
* )
*/
class Nid extends Numeric {
diff --git a/lib/Views/node/Plugin/views/argument/Type.php b/lib/Views/node/Plugin/views/argument/Type.php
index b1f686aaa9e44044a27ebfa6cbc57b3362b67f13..fd8256e5432ec614a6f75996631f8ce89b189b0e 100644
--- a/lib/Views/node/Plugin/views/argument/Type.php
+++ b/lib/Views/node/Plugin/views/argument/Type.php
@@ -16,7 +16,7 @@
/**
* @Plugin(
- * plugin_id = "node_type"
+ * id = "node_type"
* )
*/
class Type extends String {
diff --git a/lib/Views/node/Plugin/views/argument/UidRevision.php b/lib/Views/node/Plugin/views/argument/UidRevision.php
index 6eacec2e45367eaca452da3a1ecc0cd813c07dd5..56b6525ca9759cf4340a80a9a725f89af82a5ab1 100644
--- a/lib/Views/node/Plugin/views/argument/UidRevision.php
+++ b/lib/Views/node/Plugin/views/argument/UidRevision.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "node_uid_revision"
+ * id = "node_uid_revision"
* )
*/
class UidRevision extends Uid {
diff --git a/lib/Views/node/Plugin/views/argument/Vid.php b/lib/Views/node/Plugin/views/argument/Vid.php
index 0e096ddbff20364f93f3ee920f0478d957ad96c0..8b7717a57d0e16e6fdf938e572a1e74281bb7e10 100644
--- a/lib/Views/node/Plugin/views/argument/Vid.php
+++ b/lib/Views/node/Plugin/views/argument/Vid.php
@@ -16,7 +16,7 @@
/**
* @Plugin(
- * plugin_id = "node_vid"
+ * id = "node_vid"
* )
*/
class Vid extends Numeric {
diff --git a/lib/Views/node/Plugin/views/argument_default/Node.php b/lib/Views/node/Plugin/views/argument_default/Node.php
index 034a4ee2aab0981911e22a1182414b67644c50cb..1868697d4183cb31562c9c2f1efd5de7fc6a10e3 100644
--- a/lib/Views/node/Plugin/views/argument_default/Node.php
+++ b/lib/Views/node/Plugin/views/argument_default/Node.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "node",
+ * id = "node",
* title = @Translation("Content ID from URL")
* )
*/
diff --git a/lib/Views/node/Plugin/views/argument_validator/Node.php b/lib/Views/node/Plugin/views/argument_validator/Node.php
index 23cc7d8c0674bcbd001e06e96596475f89738df3..bf3543f19a6fd195ae687c2a67621bfb2e0cf7fd 100644
--- a/lib/Views/node/Plugin/views/argument_validator/Node.php
+++ b/lib/Views/node/Plugin/views/argument_validator/Node.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "node",
+ * id = "node",
* title = @Translation("Content")
* )
*/
diff --git a/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php b/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php
index b2e138ae37d90e893e582b6aacb9581b6cf17aab..8f7cdb1ae02fd6e985018e5fe0a3dd0c4e4e77c7 100644
--- a/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php
+++ b/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php
@@ -21,7 +21,7 @@
/**
* @Plugin(
- * plugin_id = "node_history_user_timestamp"
+ * id = "node_history_user_timestamp"
* )
*/
class HistoryUserTimestamp extends Node {
diff --git a/lib/Views/node/Plugin/views/field/Link.php b/lib/Views/node/Plugin/views/field/Link.php
index f4e8f61ea492095c0fc8a3383b1f0339e2395e68..bb7ebc6041fb0bb15b7d55cbdcd1d2c0efd647fa 100644
--- a/lib/Views/node/Plugin/views/field/Link.php
+++ b/lib/Views/node/Plugin/views/field/Link.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_link"
+ * id = "node_link"
* )
*/
class Link extends Entity {
diff --git a/lib/Views/node/Plugin/views/field/LinkDelete.php b/lib/Views/node/Plugin/views/field/LinkDelete.php
index ba7a00f9cfe10def82a24d62a64dd5484c8034dc..433d6bb78d7556c30aefcf9c1be6e25ba62b6a69 100644
--- a/lib/Views/node/Plugin/views/field/LinkDelete.php
+++ b/lib/Views/node/Plugin/views/field/LinkDelete.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_link_delete"
+ * id = "node_link_delete"
* )
*/
class LinkDelete extends Link {
diff --git a/lib/Views/node/Plugin/views/field/LinkEdit.php b/lib/Views/node/Plugin/views/field/LinkEdit.php
index f5c828504016de11f5e0a5111ed2a929dba87949..279dfc12e19b1226ca75e67dd6f9f84455aeb01b 100644
--- a/lib/Views/node/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/node/Plugin/views/field/LinkEdit.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_link_edit"
+ * id = "node_link_edit"
* )
*/
class LinkEdit extends Link {
diff --git a/lib/Views/node/Plugin/views/field/Node.php b/lib/Views/node/Plugin/views/field/Node.php
index 7f139343af67275f5be1565155635170ef39d6e2..e41c5248f3e4abfcc84e0d401187a537a06bc378 100644
--- a/lib/Views/node/Plugin/views/field/Node.php
+++ b/lib/Views/node/Plugin/views/field/Node.php
@@ -20,7 +20,7 @@
/**
* @Plugin(
- * plugin_id = "node"
+ * id = "node"
* )
*/
class Node extends FieldPluginBase {
diff --git a/lib/Views/node/Plugin/views/field/Path.php b/lib/Views/node/Plugin/views/field/Path.php
index 7090887816832f10b9ba3c22b691213c9efb44d7..c98b33734c84e4b64b2b0ed213b9f66fdc077b65 100644
--- a/lib/Views/node/Plugin/views/field/Path.php
+++ b/lib/Views/node/Plugin/views/field/Path.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_path"
+ * id = "node_path"
* )
*/
class Path extends FieldPluginBase {
diff --git a/lib/Views/node/Plugin/views/field/Revision.php b/lib/Views/node/Plugin/views/field/Revision.php
index 116db1b1dc84f77b85d2461d317df8c88ad44947..01161d9247f41e4d27d0c187651b3a4b02dc9f97 100644
--- a/lib/Views/node/Plugin/views/field/Revision.php
+++ b/lib/Views/node/Plugin/views/field/Revision.php
@@ -22,7 +22,7 @@
/**
* @Plugin(
- * plugin_id = "node_revision"
+ * id = "node_revision"
* )
*/
class Revision extends Node {
diff --git a/lib/Views/node/Plugin/views/field/RevisionLink.php b/lib/Views/node/Plugin/views/field/RevisionLink.php
index a1e216bb0465b16bae4d561f4fdaab779d6ac31e..032d8e294113f25c61e738ad03d02ce9d4e67490 100644
--- a/lib/Views/node/Plugin/views/field/RevisionLink.php
+++ b/lib/Views/node/Plugin/views/field/RevisionLink.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_revision_link"
+ * id = "node_revision_link"
* )
*/
class RevisionLink extends Link {
diff --git a/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php b/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php
index 51e5d6f714beb9c8b1d11efbd41bc31e92a67654..6441c5d7cbd606aeb4bfe205eef34f590012c5b8 100644
--- a/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php
+++ b/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_revision_link_delete"
+ * id = "node_revision_link_delete"
* )
*/
class RevisionLinkDelete extends RevisionLink {
diff --git a/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php b/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php
index 99f676858e367719543ea54f3133bff122a9b7b7..d2fce3aa78cbda8612e52b9332c5877b54cdcd26 100644
--- a/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php
+++ b/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_revision_link_revert"
+ * id = "node_revision_link_revert"
* )
*/
class RevisionLinkRevert extends RevisionLink {
diff --git a/lib/Views/node/Plugin/views/field/Type.php b/lib/Views/node/Plugin/views/field/Type.php
index 4f6e3439cc6c535439e5b5015eb15dd5c5c210dc..68bb561fea2c448dfabf96faae5dd69ae60ab661 100644
--- a/lib/Views/node/Plugin/views/field/Type.php
+++ b/lib/Views/node/Plugin/views/field/Type.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_type"
+ * id = "node_type"
* )
*/
class Type extends Node {
diff --git a/lib/Views/node/Plugin/views/filter/Access.php b/lib/Views/node/Plugin/views/filter/Access.php
index c90bc655de1150d25de26f48e53817c98da2abda..e718283e5c29b1f7a6095bff3aa90ac0571d15c4 100644
--- a/lib/Views/node/Plugin/views/filter/Access.php
+++ b/lib/Views/node/Plugin/views/filter/Access.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_access"
+ * id = "node_access"
* )
*/
class Access extends FilterPluginBase {
diff --git a/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php b/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php
index f9e8b27e32f06f9b60e8200a47e89b0214de62fb..df39c4041c3a2fd71120cb13b37709b94b5b4ead 100644
--- a/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php
+++ b/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php
@@ -21,7 +21,7 @@
/**
* @Plugin(
- * plugin_id = "node_history_user_timestamp"
+ * id = "node_history_user_timestamp"
* )
*/
class HistoryUserTimestamp extends FilterPluginBase {
diff --git a/lib/Views/node/Plugin/views/filter/Status.php b/lib/Views/node/Plugin/views/filter/Status.php
index 3c38f702ed7cf2168533aa9d3c46c04f30cc6247..b66d6f7e911ad1359dabd10147ed9dfc095b3eae 100644
--- a/lib/Views/node/Plugin/views/filter/Status.php
+++ b/lib/Views/node/Plugin/views/filter/Status.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_status"
+ * id = "node_status"
* )
*/
class Status extends FilterPluginBase {
diff --git a/lib/Views/node/Plugin/views/filter/Type.php b/lib/Views/node/Plugin/views/filter/Type.php
index 5577f2321a4bb663d89d9de73d0074d8231f55bc..326e1abe1593fa633003dc4dad89efb3b81307be 100644
--- a/lib/Views/node/Plugin/views/filter/Type.php
+++ b/lib/Views/node/Plugin/views/filter/Type.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_type"
+ * id = "node_type"
* )
*/
class Type extends InOperator {
diff --git a/lib/Views/node/Plugin/views/filter/UidRevision.php b/lib/Views/node/Plugin/views/filter/UidRevision.php
index a2461e68ce3dd40381128e8827051985cf25a847..11b233e609965372a7e23cd01206435e26002d12 100644
--- a/lib/Views/node/Plugin/views/filter/UidRevision.php
+++ b/lib/Views/node/Plugin/views/filter/UidRevision.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_uid_revision"
+ * id = "node_uid_revision"
* )
*/
class UidRevision extends Name {
diff --git a/lib/Views/node/Plugin/views/row/Rss.php b/lib/Views/node/Plugin/views/row/Rss.php
index 90edf9547cc3d45bc4ff2d3df36e8b476b368ba4..4a2a0b6041c67ca808d599b037ac08195ad47846 100644
--- a/lib/Views/node/Plugin/views/row/Rss.php
+++ b/lib/Views/node/Plugin/views/row/Rss.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_rss",
+ * id = "node_rss",
* title = @Translation("Content"),
* help = @Translation("Display the content with standard node view."),
* theme = "views_view_row_rss",
diff --git a/lib/Views/node/Plugin/views/row/View.php b/lib/Views/node/Plugin/views/row/View.php
index 2d66f558fa83194f6ec3b1e62d0afcc381b61de0..f035a643484f9ee5afd604a2f48d2241ebf2a95a 100644
--- a/lib/Views/node/Plugin/views/row/View.php
+++ b/lib/Views/node/Plugin/views/row/View.php
@@ -21,7 +21,7 @@
/**
* @Plugin(
- * plugin_id = "node",
+ * id = "node",
* title = @Translation("Content"),
* help = @Translation("Display the content with standard node view."),
* base = {"node"},
diff --git a/lib/Views/search/Plugin/views/argument/Search.php b/lib/Views/search/Plugin/views/argument/Search.php
index b1059db6137ca5516fb7dda710bd9c7aab0fe9e3..06777245257570515fe7ba749f6817fefe362e21 100644
--- a/lib/Views/search/Plugin/views/argument/Search.php
+++ b/lib/Views/search/Plugin/views/argument/Search.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "search"
+ * id = "search"
* )
*/
class Search extends ArgumentPluginBase {
diff --git a/lib/Views/search/Plugin/views/field/Score.php b/lib/Views/search/Plugin/views/field/Score.php
index f21c33cb172e06e872198da26ecbd200f843d7c6..2663be4d074101b73f871e5a92e7a60000d4c3d4 100644
--- a/lib/Views/search/Plugin/views/field/Score.php
+++ b/lib/Views/search/Plugin/views/field/Score.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "search_score"
+ * id = "search_score"
* )
*/
class Score extends Numeric {
diff --git a/lib/Views/search/Plugin/views/filter/Search.php b/lib/Views/search/Plugin/views/filter/Search.php
index 10835d8b5a62880b04541050d326d830aa821b8f..c159053e75f389150b36664c8185355531995144 100644
--- a/lib/Views/search/Plugin/views/filter/Search.php
+++ b/lib/Views/search/Plugin/views/filter/Search.php
@@ -20,7 +20,7 @@
/**
* @Plugin(
- * plugin_id = "search"
+ * id = "search"
* )
*/
class Search extends FilterPluginBase {
diff --git a/lib/Views/search/Plugin/views/row/View.php b/lib/Views/search/Plugin/views/row/View.php
index 4935b7ba69d58c05b747a86d25d36ea2b36c1fe3..d5818e2412bd74d4cc0e0cc31083d9c8f9c24168 100644
--- a/lib/Views/search/Plugin/views/row/View.php
+++ b/lib/Views/search/Plugin/views/row/View.php
@@ -15,7 +15,7 @@
* Plugin which performs a node_view on the resulting object.
*
* @Plugin(
- * plugin_id = "search_view",
+ * id = "search_view",
* title = @Translation("Search"),
* no_uid = TRUE
* )
diff --git a/lib/Views/search/Plugin/views/sort/Score.php b/lib/Views/search/Plugin/views/sort/Score.php
index 6174b50a0c0bb37ec560c8fcfdd1be1dea8824b0..bb9b12c76fdee8ca7b364a63a095f7a22f633862 100644
--- a/lib/Views/search/Plugin/views/sort/Score.php
+++ b/lib/Views/search/Plugin/views/sort/Score.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "search_score"
+ * id = "search_score"
* )
*/
class Score extends SortPluginBase {
diff --git a/lib/Views/statistics/Plugin/views/field/AccesslogPath.php b/lib/Views/statistics/Plugin/views/field/AccesslogPath.php
index 27f967319270b73f744a631b98071c1a30105bad..2ace184bef3eb5b587ef425d415cb938555cd15d 100644
--- a/lib/Views/statistics/Plugin/views/field/AccesslogPath.php
+++ b/lib/Views/statistics/Plugin/views/field/AccesslogPath.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "statistics_accesslog_path"
+ * id = "statistics_accesslog_path"
* )
*/
class AccesslogPath extends FieldPluginBase {
diff --git a/lib/Views/system/Plugin/views/filter/Type.php b/lib/Views/system/Plugin/views/filter/Type.php
index f2b2e75b3b136d134e5339800478bf87be3f401a..e63ed13f97dde0bdc4143ab464bf253e39ebc468 100644
--- a/lib/Views/system/Plugin/views/filter/Type.php
+++ b/lib/Views/system/Plugin/views/filter/Type.php
@@ -14,7 +14,7 @@
* Filter by system type.
*
* @Plugin(
- * plugin_id = "system_type"
+ * id = "system_type"
* )
*/
class Type extends InOperator {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/IndexTid.php b/lib/Views/taxonomy/Plugin/views/argument/IndexTid.php
index e6ffe15771fd2a815b878c41e6baf8d9a7d83ee9..5d1e8fd878b9528adbd695749fd6d4691ca4ced4 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/IndexTid.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/IndexTid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "taxonomy_index_tid"
+ * id = "taxonomy_index_tid"
* )
*/
class IndexTid extends ManyToOne {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepth.php b/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepth.php
index c618711253bf47d7013c2afe229b632c89751798..89028b9e8a0a23a24bbd9c1d7e09a6b55c0f0fab 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepth.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepth.php
@@ -21,7 +21,7 @@
/**
* @Plugin(
- * plugin_id = "taxonomy_index_tid_depth"
+ * id = "taxonomy_index_tid_depth"
* )
*/
class IndexTidDepth extends ArgumentPluginBase {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php b/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
index 32f8c250f6e4c28c68b5628272fcec82a849229f..aaac24189e935004599481a8152795df6815c983 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
@@ -21,7 +21,7 @@
/**
* @Plugin(
- * plugin_id = "taxonomy_index_tid_depth_modifier"
+ * id = "taxonomy_index_tid_depth_modifier"
* )
*/
class IndexTidDepthModifier extends ArgumentPluginBase {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/Taxonomy.php b/lib/Views/taxonomy/Plugin/views/argument/Taxonomy.php
index 6a11d92d7cffd92b9bbd57c83b1db79d5d7df396..0666d195c7154fb6b4c9b2554ce05fe622d9b7b6 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/Taxonomy.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/Taxonomy.php
@@ -18,7 +18,7 @@
/**
* @plugin(
- * plugin_id = "taxonomy"
+ * id = "taxonomy"
* )
*/
class Taxonomy extends Numeric {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/VocabularyMachineName.php b/lib/Views/taxonomy/Plugin/views/argument/VocabularyMachineName.php
index e4d86e4fce9a813ea0bf587c7ed6c445b080896a..047c40ba2d902f614a4b0af59268d5a37aac94f7 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/VocabularyMachineName.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/VocabularyMachineName.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "vocabulary_machine_name"
+ * id = "vocabulary_machine_name"
* )
*/
class VocabularyMachineName extends String {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/VocabularyVid.php b/lib/Views/taxonomy/Plugin/views/argument/VocabularyVid.php
index cd57f5be4c82e9c684814e815b58c72fb7733182..07d2589c9d45ab30a225b163cecd9f046b7f91da 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/VocabularyVid.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/VocabularyVid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "vocabulary_vid"
+ * id = "vocabulary_vid"
* )
*/
class VocabularyVid extends Numeric {
diff --git a/lib/Views/taxonomy/Plugin/views/argument_default/Tid.php b/lib/Views/taxonomy/Plugin/views/argument_default/Tid.php
index 8ca1bc3cfe83062b486face53082edb873e6db26..1707eb3d8855f9587127edbba0d10a5fbba9158a 100644
--- a/lib/Views/taxonomy/Plugin/views/argument_default/Tid.php
+++ b/lib/Views/taxonomy/Plugin/views/argument_default/Tid.php
@@ -15,7 +15,7 @@
* Taxonomy tid default argument.
*
* @Plugin(
- * plugin_id = "taxonomy_tid",
+ * id = "taxonomy_tid",
* title = @Translation("Taxonomy term ID from URL")
* )
*/
diff --git a/lib/Views/taxonomy/Plugin/views/argument_validate/Term.php b/lib/Views/taxonomy/Plugin/views/argument_validate/Term.php
index 7b7e8e02266725cf97b077fc6e83fed4febcd3eb..cf1aff54235a2f566250ea272be999c67764202d 100644
--- a/lib/Views/taxonomy/Plugin/views/argument_validate/Term.php
+++ b/lib/Views/taxonomy/Plugin/views/argument_validate/Term.php
@@ -17,7 +17,7 @@
* Validate whether an argument is an acceptable node.
*
* @Plugin(
- * plugin_id = "taxonomy_term",
+ * id = "taxonomy_term",
* title = @Translation("Taxonomy term")
*/
class Term extends ArgumentValidatorPluginBase {
diff --git a/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php b/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php
index 8e5e4d45476b37bbf85f27c846d7d41c8d14e83e..b114948923f162fdfe5bfb6b28354a4ac81e5a25 100644
--- a/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "term_link_edit"
+ * id = "term_link_edit"
* )
*/
class LinkEdit extends FieldPluginBase {
diff --git a/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php b/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php
index 7886dd1fb87fcb52afadbb6ee3ce546e48aaa91d..bbd9423e695a10e619a75ff025e7e1b6460ec0d0 100644
--- a/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php
+++ b/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php
@@ -20,7 +20,7 @@
/**
* @Plugin(
- * plugin_id = "taxonomy"
+ * id = "taxonomy"
* )
*/
class Taxonomy extends FieldPluginBase {
diff --git a/lib/Views/taxonomy/Plugin/views/field/TaxonomyIndexTid.php b/lib/Views/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
index 4f6942135930726bb78416290a55eaedadda230b..b24acf153aa54de43f9cef777dda22cd1a5a858c 100644
--- a/lib/Views/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
+++ b/lib/Views/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "taxonomy_index_tid"
+ * id = "taxonomy_index_tid"
* )
*/
class TaxonomyIndexTid extends PrerenderList {
diff --git a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
index fa810e1e8462c60cc457220b4ea10eb297cb3d96..feaceb500c69bd5b36123023f7ca592057e5f5e7 100644
--- a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "taxonomy_index_tid"
+ * id = "taxonomy_index_tid"
* )
*/
class TaxonomyIndexTid extends ManyToOne {
diff --git a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
index ef7f25ebe4864174f3efb6d5fd436b594a0bd5cb..2ef9381e005c3909cf319dc365cd6997ef88e571 100644
--- a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
+++ b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
@@ -21,7 +21,7 @@
/**
* @Plugin(
- * plugin_id = "taxonomy_index_tid_depth"
+ * id = "taxonomy_index_tid_depth"
* )
*/
class TaxonomyIndexTidDepth extends TaxonomyIndexTid {
diff --git a/lib/Views/taxonomy/Plugin/views/filter/VocabularyMachineName.php b/lib/Views/taxonomy/Plugin/views/filter/VocabularyMachineName.php
index 8215aef75bd5596ae4144c8607e57033c9059b1b..02d9db176db240386d3c8bf503eabf7c49628ff9 100644
--- a/lib/Views/taxonomy/Plugin/views/filter/VocabularyMachineName.php
+++ b/lib/Views/taxonomy/Plugin/views/filter/VocabularyMachineName.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "vocabulary_machine_name"
+ * id = "vocabulary_machine_name"
* )
*/
class VocabularyMachineName extends InOperator {
diff --git a/lib/Views/taxonomy/Plugin/views/filter/VocabularyVid.php b/lib/Views/taxonomy/Plugin/views/filter/VocabularyVid.php
index e45f162dffc26a1afd371952de73a03939cb4e59..379ce37b308e37fcc66b4917d9aa7e1a21aecbe6 100644
--- a/lib/Views/taxonomy/Plugin/views/filter/VocabularyVid.php
+++ b/lib/Views/taxonomy/Plugin/views/filter/VocabularyVid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "vocabulary_vid"
+ * id = "vocabulary_vid"
* )
*/
class VocabularyVid extends InOperator {
diff --git a/lib/Views/taxonomy/Plugin/views/relationship/NodeTermData.php b/lib/Views/taxonomy/Plugin/views/relationship/NodeTermData.php
index 7b9ada2371321db5d5347ef454bc276816ce2c40..b62a5cc2996c8541afecd89eb143236ee288353c 100644
--- a/lib/Views/taxonomy/Plugin/views/relationship/NodeTermData.php
+++ b/lib/Views/taxonomy/Plugin/views/relationship/NodeTermData.php
@@ -19,7 +19,7 @@
/**
* @Plugin(
- * plugin_id = "node_term_data"
+ * id = "node_term_data"
* )
*/
class NodeTermData extends RelationshipPluginBase {
diff --git a/lib/Views/translation/Plugin/views/argument/NodeTnid.php b/lib/Views/translation/Plugin/views/argument/NodeTnid.php
index b6eb42895b9a275d9569a4107042920aacb02cd5..286dbeac6b8f47e0e5714d7879d9db137dfe0d6d 100644
--- a/lib/Views/translation/Plugin/views/argument/NodeTnid.php
+++ b/lib/Views/translation/Plugin/views/argument/NodeTnid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_tnid"
+ * id = "node_tnid"
* )
*/
class NodeTnid extends Numeric {
diff --git a/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php b/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php
index 0a3e5e7af8d36b2c408cc970c6ecd774084d006d..dc4187bec28ede0f610350d3cbc6666c211d63e3 100644
--- a/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php
+++ b/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_link_translate"
+ * id = "node_link_translate"
* )
*/
class NodeLinkTranslate extends Link {
diff --git a/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php b/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php
index 9ccc74bada12406857393879937635ac0e5e256f..55f58055c023d7357108f6951c87b1cd26cfd28d 100644
--- a/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php
+++ b/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_translation_link"
+ * id = "node_translation_link"
* )
*/
class NodeTranslationLink extends FieldPluginBase {
diff --git a/lib/Views/translation/Plugin/views/filter/NodeTnid.php b/lib/Views/translation/Plugin/views/filter/NodeTnid.php
index 6a980fbcc104b42a85fb835f00791bd716339d52..6497d4405ac57d0ff236a507bf2412e10cc32223 100644
--- a/lib/Views/translation/Plugin/views/filter/NodeTnid.php
+++ b/lib/Views/translation/Plugin/views/filter/NodeTnid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_tnid"
+ * id = "node_tnid"
* )
*/
class NodeTnid extends FilterPluginBase {
diff --git a/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php b/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php
index 1f89cca912fec8cbe1ec506e73e4b3a44cf57d83..05cd5e9c1f00f4915ed6befbf216837c817a0f73 100644
--- a/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php
+++ b/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "node_tnid_child"
+ * id = "node_tnid_child"
* )
*/
class NodeTnidChild extends FilterPluginBase {
diff --git a/lib/Views/translation/Plugin/views/relationship/Translation.php b/lib/Views/translation/Plugin/views/relationship/Translation.php
index f36d14d7e93056705d2da4327b45107c085bf7b4..847907b32891466bfcd77986f2c64339144b3eae 100644
--- a/lib/Views/translation/Plugin/views/relationship/Translation.php
+++ b/lib/Views/translation/Plugin/views/relationship/Translation.php
@@ -20,7 +20,7 @@
/**
* @Plugin(
- * plugin_id = "translation"
+ * id = "translation"
* )
*/
class Translation extends RelationshipPluginBase {
diff --git a/lib/Views/user/Plugin/views/argument/RolesRid.php b/lib/Views/user/Plugin/views/argument/RolesRid.php
index 18bc5d4e8b6e477fe5c765e676d4e0b075c56bc8..ba15913a830999e2be634aa9bb3e3075b6b26286 100644
--- a/lib/Views/user/Plugin/views/argument/RolesRid.php
+++ b/lib/Views/user/Plugin/views/argument/RolesRid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "users_roles_rid"
+ * id = "users_roles_rid"
* )
*/
class RolesRid extends ManyToOne {
diff --git a/lib/Views/user/Plugin/views/argument/Uid.php b/lib/Views/user/Plugin/views/argument/Uid.php
index 1e683a40db299c82c1110bcf3fdcbd5eb5c7d6c6..4f33c67823b338c5242d5d80bd77bdc569d556e1 100644
--- a/lib/Views/user/Plugin/views/argument/Uid.php
+++ b/lib/Views/user/Plugin/views/argument/Uid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_uid"
+ * id = "user_uid"
* )
*/
class Uid extends Numeric {
diff --git a/lib/Views/user/Plugin/views/argument_default/CurrentUser.php b/lib/Views/user/Plugin/views/argument_default/CurrentUser.php
index 52ae8b3a47a502676cc1c2e21c4e336ba88433d7..933c9f9fa3bb3e3f09c5fa578545da09f74d57d6 100644
--- a/lib/Views/user/Plugin/views/argument_default/CurrentUser.php
+++ b/lib/Views/user/Plugin/views/argument_default/CurrentUser.php
@@ -17,7 +17,7 @@
* This plugin actually has no options so it odes not need to do a great deal.
*
* @Plugin(
- * plugin_id = "current_user",
+ * id = "current_user",
* title = @Translation("User ID from logged in user")
* )
*/
diff --git a/lib/Views/user/Plugin/views/argument_default/User.php b/lib/Views/user/Plugin/views/argument_default/User.php
index e38bd264b63a156a77d3395984004c6b2355d700..e5a6c00cbbfd72a3aa824bfe3940a264d128a650 100644
--- a/lib/Views/user/Plugin/views/argument_default/User.php
+++ b/lib/Views/user/Plugin/views/argument_default/User.php
@@ -15,7 +15,7 @@
* Default argument plugin to extract a user via menu_get_object.
*
* @Plugin(
- * plugin_id = "user",
+ * id = "user",
* title = @Translation("User ID from URL")
* )
*/
diff --git a/lib/Views/user/Plugin/views/argument_validator/User.php b/lib/Views/user/Plugin/views/argument_validator/User.php
index da295fb538ee9fb6120799addac3e033b3a596c6..da2c3429c06b99e02e9e6a625a30840f880ae650 100644
--- a/lib/Views/user/Plugin/views/argument_validator/User.php
+++ b/lib/Views/user/Plugin/views/argument_validator/User.php
@@ -19,7 +19,7 @@
* argument's title to the username.
*
* @Plugin(
- * plugin_id = "user",
+ * id = "user",
* title = @Translation("User")
* )
*/
diff --git a/lib/Views/user/Plugin/views/field/Language.php b/lib/Views/user/Plugin/views/field/Language.php
index 146800a36f1e2c409c225f19f3dd2fc918688e38..8dfd06ffdffb13c2375e50fc74126f9c2e719945 100644
--- a/lib/Views/user/Plugin/views/field/Language.php
+++ b/lib/Views/user/Plugin/views/field/Language.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "user_language"
+ * id = "user_language"
* )
*/
class Language extends User {
diff --git a/lib/Views/user/Plugin/views/field/Link.php b/lib/Views/user/Plugin/views/field/Link.php
index 4ee20a8f4e8f94316d1232576df96cc3af7996dd..b0ab040d627471d3f749af05c3e3f467259b64d8 100644
--- a/lib/Views/user/Plugin/views/field/Link.php
+++ b/lib/Views/user/Plugin/views/field/Link.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_link"
+ * id = "user_link"
* )
*/
class Link extends FieldPluginBase {
diff --git a/lib/Views/user/Plugin/views/field/LinkCancel.php b/lib/Views/user/Plugin/views/field/LinkCancel.php
index 96ee4f191f95cc179b3ed9488540fd1c4255ca66..4dff2695d681f547d1e5d0342e090163e8c20bf1 100644
--- a/lib/Views/user/Plugin/views/field/LinkCancel.php
+++ b/lib/Views/user/Plugin/views/field/LinkCancel.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "user_link_cancel"
+ * id = "user_link_cancel"
* )
*/
class LinkCancel extends Link {
diff --git a/lib/Views/user/Plugin/views/field/LinkEdit.php b/lib/Views/user/Plugin/views/field/LinkEdit.php
index 540a6029b0974a6118f18469f952b6bd622b1a0f..0003d01cd18e82175ba45f5e689d010b8a831cb9 100644
--- a/lib/Views/user/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/user/Plugin/views/field/LinkEdit.php
@@ -17,7 +17,7 @@
/**
* @Plugin(
- * plugin_id = "user_link_edit"
+ * id = "user_link_edit"
* )
*/
class LinkEdit extends Link {
diff --git a/lib/Views/user/Plugin/views/field/Mail.php b/lib/Views/user/Plugin/views/field/Mail.php
index eb7704eed60747a68c383328e79b2bf1e0fe60fd..3cd28fadfe1a041c4cea6d27de9c86ca59f604c4 100644
--- a/lib/Views/user/Plugin/views/field/Mail.php
+++ b/lib/Views/user/Plugin/views/field/Mail.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_mail"
+ * id = "user_mail"
* )
*/
class Mail extends User {
diff --git a/lib/Views/user/Plugin/views/field/Name.php b/lib/Views/user/Plugin/views/field/Name.php
index ce2cda7e88d697c432897f706c103aad1ef6da21..c77f3525c616d76c9ead3fe5503f1e8d1741bdd3 100644
--- a/lib/Views/user/Plugin/views/field/Name.php
+++ b/lib/Views/user/Plugin/views/field/Name.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_name"
+ * id = "user_name"
* )
*/
class Name extends User {
diff --git a/lib/Views/user/Plugin/views/field/Permissions.php b/lib/Views/user/Plugin/views/field/Permissions.php
index 5edde3e6cb055c350f8a1576f7da2fcef1b24f63..3f4b0dbd9fd11a87146a76b8821f9ccee84bdb92 100644
--- a/lib/Views/user/Plugin/views/field/Permissions.php
+++ b/lib/Views/user/Plugin/views/field/Permissions.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_permissions"
+ * id = "user_permissions"
* )
*/
class Permissions extends PrerenderList {
diff --git a/lib/Views/user/Plugin/views/field/Picture.php b/lib/Views/user/Plugin/views/field/Picture.php
index b12e4aca21da2b9e27b1f913a79032f8ecfb1126..58a7d2d46e84f9beb90013686d8157e133143d15 100644
--- a/lib/Views/user/Plugin/views/field/Picture.php
+++ b/lib/Views/user/Plugin/views/field/Picture.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_picture"
+ * id = "user_picture"
* )
*/
class Picture extends FieldPluginBase {
diff --git a/lib/Views/user/Plugin/views/field/Roles.php b/lib/Views/user/Plugin/views/field/Roles.php
index f27182f3c8f9166161cc9ab95dca0ffbd5ff06e1..58e1e776272623a03be4f650a5379f066fb6ff7f 100644
--- a/lib/Views/user/Plugin/views/field/Roles.php
+++ b/lib/Views/user/Plugin/views/field/Roles.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_roles"
+ * id = "user_roles"
* )
*/
class Roles extends PrerenderList {
diff --git a/lib/Views/user/Plugin/views/field/User.php b/lib/Views/user/Plugin/views/field/User.php
index 068569dc518828e311d05cac390a4f6027d83ec4..9b236d6c56c5a9ea1b3d4f5169847243f1c86685 100644
--- a/lib/Views/user/Plugin/views/field/User.php
+++ b/lib/Views/user/Plugin/views/field/User.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user"
+ * id = "user"
* )
*/
class User extends FieldPluginBase {
diff --git a/lib/Views/user/Plugin/views/filter/Current.php b/lib/Views/user/Plugin/views/filter/Current.php
index e266ed07a801b42e9c1a82bd485d620f50d6cdd4..ef1258cc34b80549a009e711810a90468357882d 100644
--- a/lib/Views/user/Plugin/views/filter/Current.php
+++ b/lib/Views/user/Plugin/views/filter/Current.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_current"
+ * id = "user_current"
* )
*/
class Current extends BooleanOperator {
diff --git a/lib/Views/user/Plugin/views/filter/Name.php b/lib/Views/user/Plugin/views/filter/Name.php
index 5bf3ded5e00e57f42018e6c09a1a269a52e7264c..2859c885dee67383bd30abe98b71fb64434ef1cf 100644
--- a/lib/Views/user/Plugin/views/filter/Name.php
+++ b/lib/Views/user/Plugin/views/filter/Name.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_name"
+ * id = "user_name"
* )
*/
class Name extends InOperator {
diff --git a/lib/Views/user/Plugin/views/filter/Permissions.php b/lib/Views/user/Plugin/views/filter/Permissions.php
index 157b4c7098511dd638664d7164dda2cb4e8860db..aac996d5dcd57d4b45263c079dd9d81b6da92ead 100644
--- a/lib/Views/user/Plugin/views/filter/Permissions.php
+++ b/lib/Views/user/Plugin/views/filter/Permissions.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_permissions"
+ * id = "user_permissions"
* )
*/
class Permissions extends ManyToOne {
diff --git a/lib/Views/user/Plugin/views/filter/Roles.php b/lib/Views/user/Plugin/views/filter/Roles.php
index 7488179d0003ba020effcd43ce1d299fe736f65e..42b14b8dd797db86027c300802962ce183fb6b32 100644
--- a/lib/Views/user/Plugin/views/filter/Roles.php
+++ b/lib/Views/user/Plugin/views/filter/Roles.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_roles"
+ * id = "user_roles"
* )
*/
class Roles extends ManyToOne {
diff --git a/lib/Views/user/Plugin/views/row/View.php b/lib/Views/user/Plugin/views/row/View.php
index 8d80d5d934d5e1591a0a6b1c06a81eba480c5917..26a77cd4cbe69572246e7cb0d849d33ca2710221 100644
--- a/lib/Views/user/Plugin/views/row/View.php
+++ b/lib/Views/user/Plugin/views/row/View.php
@@ -18,7 +18,7 @@
*/
/**
* @Plugin(
- * plugin_id = "user",
+ * id = "user",
* title = @Translation("User"),
* help = @Translation("Display the user with standard user view."),
* base = {"users"},
diff --git a/modules/aggregator.views.inc b/modules/aggregator.views.inc
index c28949abd135348cc3a312e13cceed79f6ebaf0c..7ad339424db73c54bba6283325fd51b8ecbc08b0 100644
--- a/modules/aggregator.views.inc
+++ b/modules/aggregator.views.inc
@@ -34,22 +34,22 @@ function aggregator_views_data() {
'help' => t('The unique ID of the aggregator item.'), // The help that appears on the UI,
// Information for displaying the iid
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
// Information for accepting a iid as an argument
'argument' => array(
- 'plugin_id' => 'aggregator_iid',
+ 'id' => 'aggregator_iid',
'name field' => 'title', // the field to display in the summary.
'numeric' => TRUE,
),
// Information for accepting a nid as a filter
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
// Information for sorting on a nid.
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -59,16 +59,16 @@ function aggregator_views_data() {
'help' => t('The title of the aggregator item.'),
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'aggregator_title_link',
+ 'id' => 'aggregator_title_link',
'extra' => array('link'),
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
// Information for accepting a title as a filter
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -77,15 +77,15 @@ function aggregator_views_data() {
'title' => t('Link'), // The item it appears as on the UI,
'help' => t('The link to the original source URL of the item.'),
'field' => array(
- 'plugin_id' => 'url',
+ 'id' => 'url',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
// Information for accepting a title as a filter
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -95,18 +95,18 @@ function aggregator_views_data() {
'help' => t('The author of the original imported item.'),
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'aggregator_xss',
+ 'id' => 'aggregator_xss',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
// Information for accepting a title as a filter
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -116,18 +116,18 @@ function aggregator_views_data() {
'help' => t('The guid of the original imported item.'),
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'xss',
+ 'id' => 'xss',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
// Information for accepting a title as a filter
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -137,12 +137,12 @@ function aggregator_views_data() {
'help' => t('The actual content of the imported item.'),
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'aggregator_xss',
+ 'id' => 'aggregator_xss',
'click sortable' => FALSE,
),
// Information for accepting a title as a filter
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -152,18 +152,18 @@ function aggregator_views_data() {
'help' => t('The date the original feed item was posted. (With some feeds, this will be the date it was imported.)'),
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
// Information for accepting a title as a filter
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
'argument' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -187,22 +187,22 @@ function aggregator_views_data() {
'help' => t('The unique ID of the aggregator feed.'), // The help that appears on the UI,
// Information for displaying the fid
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
// Information for accepting a fid as an argument
'argument' => array(
- 'plugin_id' => 'aggregator_fid',
+ 'id' => 'aggregator_fid',
'name field' => 'title', // the field to display in the summary.
'numeric' => TRUE,
),
// Information for accepting a nid as a filter
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
// Information for sorting on a fid.
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -212,19 +212,19 @@ function aggregator_views_data() {
'help' => t('The title of the aggregator feed.'),
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'aggregator_title_link',
+ 'id' => 'aggregator_title_link',
'extra' => array('link'),
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
// Information for accepting a title as a filter
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -234,14 +234,14 @@ function aggregator_views_data() {
'help' => t('The link to the source URL of the feed.'),
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'url',
+ 'id' => 'url',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -251,17 +251,17 @@ function aggregator_views_data() {
'help' => t('The date the feed was last checked for new content.'),
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
'argument' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -271,11 +271,11 @@ function aggregator_views_data() {
'help' => t('The description of the aggregator feed.'),
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'xss',
+ 'id' => 'xss',
'click sortable' => FALSE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -285,18 +285,18 @@ function aggregator_views_data() {
'help' => t('The date of the most recent new content on the feed.'),
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
// Information for accepting a title as a filter
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
'argument' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -328,19 +328,19 @@ function aggregator_views_data() {
'title' => t('Category ID'),
'help' => t('The unique ID of the aggregator category.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'aggregator_category_cid',
+ 'id' => 'aggregator_category_cid',
'name field' => 'title',
'numeric' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'aggregator_category_cid',
+ 'id' => 'aggregator_category_cid',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -349,14 +349,14 @@ function aggregator_views_data() {
'title' => t('Category'),
'help' => t('The title of the aggregator category.'),
'field' => array(
- 'plugin_id' => 'aggregator_category',
+ 'id' => 'aggregator_category',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
diff --git a/modules/book.views.inc b/modules/book.views.inc
index dc48c8d1649ca319e6f18034db12f83ba35d94a8..731a4959517aec7d9b48b425282c1b05668c2b23 100644
--- a/modules/book.views.inc
+++ b/modules/book.views.inc
@@ -27,7 +27,7 @@ function book_views_data() {
'help' => t('The book the node is in.'),
'relationship' => array(
'base' => 'node',
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'label' => t('Book'),
),
// There is no argument here; if you need an argument, add the relationship
@@ -52,11 +52,11 @@ function book_views_data() {
'title' => t('Weight'),
'help' => t('The weight of the book page.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -64,17 +64,17 @@ function book_views_data() {
'title' => t('Depth'),
'help' => t('The depth of the book page in the hierarchy; top level books have a depth of 1.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'argument' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -82,7 +82,7 @@ function book_views_data() {
'title' => t('Hierarchy'),
'help' => t('The order of pages in the book hierarchy.'),
'sort' => array(
- 'plugin_id' => 'menu_hierarchy',
+ 'id' => 'menu_hierarchy',
),
);
@@ -107,7 +107,7 @@ function book_views_data() {
'relationship' => array(
'base' => 'node',
'base field' => 'nid',
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'label' => t('Book parent'),
),
);
diff --git a/modules/comment.views.inc b/modules/comment.views.inc
index f747db86583710e9a2f98cd964128a55c1774a3b..53146f714eb68a7762b040a5b5eb01ea0d2d3d2f 100644
--- a/modules/comment.views.inc
+++ b/modules/comment.views.inc
@@ -43,17 +43,17 @@ function comment_views_data() {
'title' => t('Title'),
'help' => t('The title of the comment.'),
'field' => array(
- 'plugin_id' => 'comment',
+ 'id' => 'comment',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -62,17 +62,17 @@ function comment_views_data() {
'title' => t('ID'),
'help' => t('The comment ID of the field'),
'field' => array(
- 'plugin_id' => 'comment',
+ 'id' => 'comment',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
);
@@ -81,17 +81,17 @@ function comment_views_data() {
'title' => t('Author'),
'help' => t("The name of the comment's author. Can be rendered as a link to the author's homepage."),
'field' => array(
- 'plugin_id' => 'comment_username',
+ 'id' => 'comment_username',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -100,17 +100,17 @@ function comment_views_data() {
'title' => t("Author's website"),
'help' => t("The website address of the comment's author. Can be rendered as a link. Will be empty if the author is a registered user."),
'field' => array(
- 'plugin_id' => 'url',
+ 'id' => 'url',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -119,17 +119,17 @@ function comment_views_data() {
'title' => t('Hostname'),
'help' => t('Hostname of user that posted the comment.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -138,17 +138,17 @@ function comment_views_data() {
'title' => t('Mail'),
'help' => t('Email of user that posted the comment. Will be empty if the author is a registered user.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -157,14 +157,14 @@ function comment_views_data() {
'title' => t('Post date'),
'help' => t('Date and time of when the comment was created.'),
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -175,17 +175,17 @@ function comment_views_data() {
'title' => t('Language'),
'help' => t('The language the comment is in.'),
'field' => array(
- 'plugin_id' => 'locale_language',
+ 'id' => 'locale_language',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'locale_language',
+ 'id' => 'locale_language',
),
'argument' => array(
- 'plugin_id' => 'locale_language',
+ 'id' => 'locale_language',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
}
@@ -196,14 +196,14 @@ function comment_views_data() {
'title' => t('Updated date'),
'help' => t('Date and time of when the comment was last updated.'),
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -213,7 +213,7 @@ function comment_views_data() {
'help' => t('Date in the form of CCYYMMDD.'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_fulldate',
+ 'id' => 'node_created_fulldate',
),
);
@@ -223,7 +223,7 @@ function comment_views_data() {
'help' => t('Date in the form of YYYYMM.'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_year_month',
+ 'id' => 'node_created_year_month',
),
);
@@ -233,7 +233,7 @@ function comment_views_data() {
'help' => t('Date in the form of YYYY.'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_year',
+ 'id' => 'node_created_year',
),
);
@@ -243,7 +243,7 @@ function comment_views_data() {
'help' => t('Date in the form of MM (01 - 12).'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_month',
+ 'id' => 'node_created_month',
),
);
@@ -253,7 +253,7 @@ function comment_views_data() {
'help' => t('Date in the form of DD (01 - 31).'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_day',
+ 'id' => 'node_created_day',
),
);
@@ -263,7 +263,7 @@ function comment_views_data() {
'help' => t('Date in the form of WW (01 - 53).'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_week',
+ 'id' => 'node_created_week',
),
);
@@ -272,19 +272,19 @@ function comment_views_data() {
'title' => t('Approved'),
'help' => t('Whether the comment is approved (or still in the moderation queue).'),
'field' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'click sortable' => TRUE,
'output formats' => array(
'approved-not-approved' => array(t('Approved'), t('Not Approved')),
),
),
'filter' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'label' => t('Approved comment'),
'type' => 'yes-no',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -293,7 +293,7 @@ function comment_views_data() {
'field' => array(
'title' => t('View link'),
'help' => t('Provide a simple link to view the comment.'),
- 'plugin_id' => 'comment_link',
+ 'id' => 'comment_link',
),
);
@@ -302,7 +302,7 @@ function comment_views_data() {
'field' => array(
'title' => t('Edit link'),
'help' => t('Provide a simple link to edit the comment.'),
- 'plugin_id' => 'comment_link_edit',
+ 'id' => 'comment_link_edit',
),
);
@@ -311,7 +311,7 @@ function comment_views_data() {
'field' => array(
'title' => t('Delete link'),
'help' => t('Provide a simple link to delete the comment.'),
- 'plugin_id' => 'comment_link_delete',
+ 'id' => 'comment_link_delete',
),
);
@@ -321,7 +321,7 @@ function comment_views_data() {
'field' => array(
'title' => t('Approve link'),
'help' => t('Provide a simple link to approve the comment.'),
- 'plugin_id' => 'comment_link_approve',
+ 'id' => 'comment_link_approve',
),
);
@@ -330,7 +330,7 @@ function comment_views_data() {
'field' => array(
'title' => t('Reply-to link'),
'help' => t('Provide a simple link to reply to the comment.'),
- 'plugin_id' => 'comment_link_reply',
+ 'id' => 'comment_link_reply',
),
);
@@ -338,12 +338,12 @@ function comment_views_data() {
'field' => array(
'title' => t('Depth'),
'help' => t('Display the depth of the comment if it is threaded.'),
- 'plugin_id' => 'comment_depth',
+ 'id' => 'comment_depth',
),
'sort' => array(
'title' => t('Thread'),
'help' => t('Sort by the threaded order. This will keep child comments together with their parents.'),
- 'plugin_id' => 'comment_thread',
+ 'id' => 'comment_thread',
),
);
@@ -355,17 +355,17 @@ function comment_views_data() {
'help' => t('The content to which the comment is a reply to.'),
'base' => 'node',
'base field' => 'nid',
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'label' => t('Content'),
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
);
@@ -377,17 +377,17 @@ function comment_views_data() {
'help' => t("The User ID of the comment's author."),
'base' => 'users',
'base field' => 'uid',
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'label' => t('author'),
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'field' => array(
- 'plugin_id' => 'user',
+ 'id' => 'user',
),
);
@@ -395,14 +395,14 @@ function comment_views_data() {
'title' => t('Parent CID'),
'help' => t('The Comment ID of the parent comment.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'relationship' => array(
'title' => t('Parent comment'),
'help' => t('The parent comment.'),
'base' => 'comment',
'base field' => 'cid',
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'label' => t('Parent comment'),
),
);
@@ -428,14 +428,14 @@ function comment_views_data() {
'title' => t('Last comment time'),
'help' => t('Date and time of when the last comment was posted.'),
'field' => array(
- 'plugin_id' => 'comment_last_timestamp',
+ 'id' => 'comment_last_timestamp',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -444,12 +444,12 @@ function comment_views_data() {
'title' => t("Last comment author"),
'help' => t('The name of the author of the last posted comment.'),
'field' => array(
- 'plugin_id' => 'comment_ncs_last_comment_name',
+ 'id' => 'comment_ncs_last_comment_name',
'click sortable' => TRUE,
'no group by' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'comment_ncs_last_comment_name',
+ 'id' => 'comment_ncs_last_comment_name',
'no group by' => TRUE,
),
);
@@ -459,17 +459,17 @@ function comment_views_data() {
'title' => t('Comment count'),
'help' => t('The number of comments a node has.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'argument' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -478,16 +478,16 @@ function comment_views_data() {
'title' => t('Updated/commented date'),
'help' => t('The most recent of last comment posted or node updated time.'),
'field' => array(
- 'plugin_id' => 'comment_ncs_last_updated',
+ 'id' => 'comment_ncs_last_updated',
'click sortable' => TRUE,
'no group by' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'comment_ncs_last_updated',
+ 'id' => 'comment_ncs_last_updated',
'no group by' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'comment_ncs_last_updated',
+ 'id' => 'comment_ncs_last_updated',
),
);
@@ -500,7 +500,7 @@ function comment_views_data() {
'group' => t('Comment'),
'base' => 'comment',
'base field' => 'cid',
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'label' => t('Last Comment'),
),
);
@@ -513,17 +513,17 @@ function comment_views_data() {
'title' => t('Last comment author'),
'base' => 'users',
'base field' => 'uid',
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'label' => t('Last comment author'),
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
);
@@ -540,7 +540,7 @@ function comment_views_data_alter(&$data) {
'title' => t('New comments'),
'help' => t('The number of new comments on the node.'),
'field' => array(
- 'plugin_id' => 'node_new_comments',
+ 'id' => 'node_new_comments',
'no group by' => TRUE,
),
);
@@ -549,7 +549,7 @@ function comment_views_data_alter(&$data) {
'field' => array(
'title' => t('Add comment link'),
'help' => t('Display the standard add comment link used on regular nodes, which will only display if the viewing user has access to add a comment.'),
- 'plugin_id' => 'comment_node_link',
+ 'id' => 'comment_node_link',
),
);
@@ -558,14 +558,14 @@ function comment_views_data_alter(&$data) {
'title' => t('Comment status'),
'help' => t('Whether comments are enabled or disabled on the node.'),
'field' => array(
- 'plugin_id' => 'node_comment',
+ 'id' => 'node_comment',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'node_comment',
+ 'id' => 'node_comment',
),
);
@@ -576,14 +576,14 @@ function comment_views_data_alter(&$data) {
'field' => 'uid',
'name table' => 'users',
'name field' => 'name',
- 'plugin_id' => 'argument_comment_user_uid',
+ 'id' => 'argument_comment_user_uid',
'no group by' => TRUE,
),
'filter' => array(
'field' => 'uid',
'name table' => 'users',
'name field' => 'name',
- 'plugin_id' => 'comment_user_uid',
+ 'id' => 'comment_user_uid',
),
);
@@ -596,7 +596,7 @@ function comment_views_data_alter(&$data) {
'base' => 'comment',
'base field' => 'nid',
'relationship field' => 'nid',
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
diff --git a/modules/contact.views.inc b/modules/contact.views.inc
index b7e1b7232e678b163011f6784668436e6116bd2b..307ffbc176d134cfd8e24ce40ff439853ef29f30 100644
--- a/modules/contact.views.inc
+++ b/modules/contact.views.inc
@@ -15,7 +15,7 @@ function contact_views_data_alter(&$data) {
'field' => array(
'title' => t('Link to contact page'),
'help' => t('Provide a simple link to the user contact page.'),
- 'plugin_id' => 'contact_link',
+ 'id' => 'contact_link',
),
);
}
diff --git a/modules/field.views.inc b/modules/field.views.inc
index bc407681f35aa406ceb4c83ad52768412e7db79a..eb8d193a6b8054508c1486996f503d1ca46a74d8 100644
--- a/modules/field.views.inc
+++ b/modules/field.views.inc
@@ -234,7 +234,7 @@ function field_views_field_default_views_data($field) {
$real_field = reset($keys);
$data[$table][$column]['field'] = array(
'table' => $table,
- 'plugin_id' => 'field',
+ 'id' => 'field',
'click sortable' => TRUE,
'field_name' => $field['field_name'],
// Provide a real field for group by.
@@ -335,7 +335,7 @@ function field_views_field_default_views_data($field) {
$data[$table][$column_real_name]['argument'] = array(
'field' => $column_real_name,
'table' => $table,
- 'plugin_id' => $argument,
+ 'id' => $argument,
'additional fields' => $additional_fields,
'field_name' => $field['field_name'],
'empty field name' => t('- No value -'),
@@ -343,7 +343,7 @@ function field_views_field_default_views_data($field) {
$data[$table][$column_real_name]['filter'] = array(
'field' => $column_real_name,
'table' => $table,
- 'plugin_id' => $filter,
+ 'id' => $filter,
'additional fields' => $additional_fields,
'field_name' => $field['field_name'],
'allow empty' => TRUE,
@@ -352,7 +352,7 @@ function field_views_field_default_views_data($field) {
$data[$table][$column_real_name]['sort'] = array(
'field' => $column_real_name,
'table' => $table,
- 'plugin_id' => $sort,
+ 'id' => $sort,
'additional fields' => $additional_fields,
'field_name' => $field['field_name'],
);
@@ -370,12 +370,12 @@ function field_views_field_default_views_data($field) {
'help' => t('Delta - Appears in: @bundles.', array('@bundles' => implode(', ', $bundles_names))),
);
$data[$table]['delta']['field'] = array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
);
$data[$table]['delta']['argument'] = array(
'field' => 'delta',
'table' => $table,
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'additional fields' => $additional_fields,
'empty field name' => t('- No value -'),
'field_name' => $field['field_name'],
@@ -383,7 +383,7 @@ function field_views_field_default_views_data($field) {
$data[$table]['delta']['filter'] = array(
'field' => 'delta',
'table' => $table,
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'additional fields' => $additional_fields,
'field_name' => $field['field_name'],
'allow empty' => TRUE,
@@ -391,7 +391,7 @@ function field_views_field_default_views_data($field) {
$data[$table]['delta']['sort'] = array(
'field' => 'delta',
'table' => $table,
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'additional fields' => $additional_fields,
'field_name' => $field['field_name'],
);
@@ -410,14 +410,14 @@ function list_field_views_data($field) {
foreach ($data as $table_name => $table_data) {
foreach ($table_data as $field_name => $field_data) {
if (isset($field_data['filter']) && $field_name != 'delta') {
- $data[$table_name][$field_name]['filter']['plugin_id'] = 'field_list';
+ $data[$table_name][$field_name]['filter']['id'] = 'field_list';
}
if (isset($field_data['argument']) && $field_name != 'delta') {
if ($field['type'] == 'list_text') {
- $data[$table_name][$field_name]['argument']['plugin_id'] = 'field_list_string';
+ $data[$table_name][$field_name]['argument']['id'] = 'field_list_string';
}
else {
- $data[$table_name][$field_name]['argument']['plugin_id'] = 'field_list';
+ $data[$table_name][$field_name]['argument']['id'] = 'field_list';
}
}
}
diff --git a/modules/file.views.inc b/modules/file.views.inc
index df8bebe80389ea74d757b493873a977324b2ae87..f13025951211bbc2921e12a4ca560bf66fd207f0 100644
--- a/modules/file.views.inc
+++ b/modules/file.views.inc
@@ -20,7 +20,7 @@ function file_field_views_data($field) {
foreach ($data as $table_name => $table_data) {
// Add the relationship only on the fid field.
$data[$table_name][$field['field_name'] . '_fid']['relationship'] = array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'base' => 'file_managed',
'entity type' => 'file',
'base field' => 'fid',
@@ -50,7 +50,7 @@ function file_field_views_data_views_data_alter(&$data, $field) {
$data['file_managed'][$pseudo_field_name]['relationship'] = array(
'title' => t('@entity using @field', array('@entity' => $entity, '@field' => $label)),
'help' => t('Relate each @entity with a @field set to the file.', array('@entity' => $entity, '@field' => $label)),
- 'plugin_id' => 'entity_reverse',
+ 'id' => 'entity_reverse',
'field_name' => $field['field_name'],
'field table' => _field_sql_storage_tablename($field),
'field field' => $field['field_name'] . '_fid',
diff --git a/modules/image.views.inc b/modules/image.views.inc
index 09c6b3772d98e3ac75cfbe4f1cc5733fa115b8c2..43c04d69ac0fc0470be528ba9fbaea0c3abda21b 100644
--- a/modules/image.views.inc
+++ b/modules/image.views.inc
@@ -20,7 +20,7 @@ function image_field_views_data($field) {
foreach ($data as $table_name => $table_data) {
// Add the relationship only on the fid field.
$data[$table_name][$field['field_name'] . '_fid']['relationship'] = array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'base' => 'file_managed',
'base field' => 'fid',
'label' => t('image from !field_name', array('!field_name' => $field['field_name'])),
@@ -49,7 +49,7 @@ function image_field_views_data_views_data_alter(&$data, $field) {
$data['file_managed'][$pseudo_field_name]['relationship'] = array(
'title' => t('@entity using @field', array('@entity' => $entity, '@field' => $label)),
'help' => t('Relate each @entity with a @field set to the image.', array('@entity' => $entity, '@field' => $label)),
- 'plugin_id' => 'entity_reverse',
+ 'id' => 'entity_reverse',
'field_name' => $field['field_name'],
'field table' => _field_sql_storage_tablename($field),
'field field' => $field['field_name'] . '_fid',
diff --git a/modules/language.views.inc b/modules/language.views.inc
index d47b64fcddd067e0ee191a8bac8f92726eb7a1e7..17801913f2fe5609499fb40de697a0657c81ec9b 100644
--- a/modules/language.views.inc
+++ b/modules/language.views.inc
@@ -27,16 +27,16 @@ function language_views_data() {
'title' => t('Language code'),
'help' => t("Language code, e.g. 'de' or 'en-US'."),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string'
+ 'id' => 'string'
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -44,16 +44,16 @@ function language_views_data() {
'title' => t('Language name'),
'help' => t("Language name, e.g. 'German' or 'English'."),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string'
+ 'id' => 'string'
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -61,16 +61,16 @@ function language_views_data() {
'title' => t('Direction'),
'help' => t('Direction of language (Left-to-Right = 0, Right-to-Left = 1).'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'filter' => array(
- 'plugin_id' => 'numeric'
+ 'id' => 'numeric'
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -78,16 +78,16 @@ function language_views_data() {
'title' => t('Weight'),
'help' => t('Weight, used in lists of languages.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'filter' => array(
- 'plugin_id' => 'numeric'
+ 'id' => 'numeric'
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
diff --git a/modules/locale.views.inc b/modules/locale.views.inc
index b4246fe99d89cc2f21a412c222465f72551c0410..cdbb32bc9e47160ae161d1cebd6316cf20531712 100644
--- a/modules/locale.views.inc
+++ b/modules/locale.views.inc
@@ -28,19 +28,19 @@ function locale_views_data() {
'title' => t('LID'),
'help' => t('The ID of the source string.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'numeric' => TRUE,
'validate type' => 'lid',
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -50,17 +50,17 @@ function locale_views_data() {
'title' => t('Location'),
'help' => t('A description of the location or context of the string.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -70,14 +70,14 @@ function locale_views_data() {
'title' => t('Group'),
'help' => t('The group the translation is in.'),
'field' => array(
- 'plugin_id' => 'locale_group',
+ 'id' => 'locale_group',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'locale_group',
+ 'id' => 'locale_group',
),
'argument' => array(
- 'plugin_id' => 'locale_group',
+ 'id' => 'locale_group',
),
);
@@ -87,10 +87,10 @@ function locale_views_data() {
'title' => t('Source'),
'help' => t('The full original string.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -100,14 +100,14 @@ function locale_views_data() {
'title' => t('Version'),
'help' => t('The version of Drupal core that this string is for.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'locale_version',
+ 'id' => 'locale_version',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -116,7 +116,7 @@ function locale_views_data() {
'field' => array(
'title' => t('Edit link'),
'help' => t('Provide a simple link to edit the translations.'),
- 'plugin_id' => 'locale_link_edit',
+ 'id' => 'locale_link_edit',
),
);
@@ -141,10 +141,10 @@ function locale_views_data() {
'title' => t('Translation'),
'help' => t('The full translation string.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -154,14 +154,14 @@ function locale_views_data() {
'title' => t('Language'),
'help' => t('The language this translation is in.'),
'field' => array(
- 'plugin_id' => 'locale_language',
+ 'id' => 'locale_language',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'locale_language',
+ 'id' => 'locale_language',
),
'argument' => array(
- 'plugin_id' => 'locale_language',
+ 'id' => 'locale_language',
),
);
@@ -170,7 +170,7 @@ function locale_views_data() {
'title' => t('Singular LID'),
'help' => t('The ID of the parent translation.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -180,16 +180,16 @@ function locale_views_data() {
'title' => t('Plural'),
'help' => t('Whether or not the translation is plural.'),
'field' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'label' => t('Plural'),
'type' => 'yes-no',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -205,17 +205,17 @@ function locale_views_data_alter(&$data) {
'title' => t('Language'),
'help' => t('The language the content is in.'),
'field' => array(
- 'plugin_id' => 'node_language',
+ 'id' => 'node_language',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'node_language',
+ 'id' => 'node_language',
),
'argument' => array(
- 'plugin_id' => 'node_language',
+ 'id' => 'node_language',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
}
diff --git a/modules/node.views.inc b/modules/node.views.inc
index 0a12ca1f0e41069f4627d92e1136721715bfc180..101a21ecaf025c34cf8a45fb35b40e36a9164cfc 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -48,23 +48,23 @@ function node_views_data() {
'help' => t('The node ID.'), // The help that appears on the UI,
// Information for displaying the nid
'field' => array(
- 'plugin_id' => 'node',
+ 'id' => 'node',
'click sortable' => TRUE,
),
// Information for accepting a nid as an argument
'argument' => array(
- 'plugin_id' => 'node_nid',
+ 'id' => 'node_nid',
'name field' => 'title', // the field to display in the summary.
'numeric' => TRUE,
'validate type' => 'nid',
),
// Information for accepting a nid as a filter
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
// Information for sorting on a nid.
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -77,19 +77,19 @@ function node_views_data() {
'field' => array(
'field' => 'title', // the real field. This could be left out since it is the same.
'group' => t('Content'), // The group it appears in on the UI. Could be left out.
- 'plugin_id' => 'node',
+ 'id' => 'node',
'click sortable' => TRUE,
'link_to_node default' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
// Information for accepting a title as a filter
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -98,14 +98,14 @@ function node_views_data() {
'title' => t('Post date'), // The item it appears as on the UI,
'help' => t('The date the content was posted.'), // The help that appears on the UI,
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date'
+ 'id' => 'date'
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -114,14 +114,14 @@ function node_views_data() {
'title' => t('Updated date'), // The item it appears as on the UI,
'help' => t('The date the content was last updated.'), // The help that appears on the UI,
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date'
+ 'id' => 'date'
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -130,17 +130,17 @@ function node_views_data() {
'title' => t('Type'), // The item it appears as on the UI,
'help' => t('The content type (for example, "blog entry", "forum post", "story", etc).'), // The help that appears on the UI,
'field' => array(
- 'plugin_id' => 'node_type',
+ 'id' => 'node_type',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'node_type',
+ 'id' => 'node_type',
),
'argument' => array(
- 'plugin_id' => 'node_type',
+ 'id' => 'node_type',
),
);
@@ -149,20 +149,20 @@ function node_views_data() {
'title' => t('Published'),
'help' => t('Whether or not the content is published.'),
'field' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'click sortable' => TRUE,
'output formats' => array(
'published-notpublished' => array(t('Published'), t('Not published')),
),
),
'filter' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'label' => t('Published'),
'type' => 'yes-no',
'use equal' => TRUE, // Use status = 1 instead of status <> 0 in WHERE statment
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -172,7 +172,7 @@ function node_views_data() {
'help' => t('Filters out unpublished content if the current user cannot view it.'),
'filter' => array(
'field' => 'status',
- 'plugin_id' => 'node_status',
+ 'id' => 'node_status',
'label' => t('Published or admin'),
),
);
@@ -182,19 +182,19 @@ function node_views_data() {
'title' => t('Promoted to front page'),
'help' => t('Whether or not the content is promoted to the front page.'),
'field' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'click sortable' => TRUE,
'output formats' => array(
'promoted-notpromoted' => array(t('Promoted'), t('Not promoted')),
),
),
'filter' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'label' => t('Promoted to front page'),
'type' => 'yes-no',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -204,19 +204,19 @@ function node_views_data() {
'help' => t('Whether or not the content is sticky.'), // The help that appears on the UI,
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'click sortable' => TRUE,
'output formats' => array(
'sticky' => array(t('Sticky'), t('Not sticky')),
),
),
'filter' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'label' => t('Sticky'),
'type' => 'yes-no',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'help' => t('Whether or not the content is sticky. To list sticky content first, set this to descending.'),
),
);
@@ -232,7 +232,7 @@ function node_views_data() {
'field' => array(
'title' => t('Link'),
'help' => t('Provide a simple link to the content.'),
- 'plugin_id' => 'node_link',
+ 'id' => 'node_link',
),
);
@@ -241,7 +241,7 @@ function node_views_data() {
'field' => array(
'title' => t('Edit link'),
'help' => t('Provide a simple link to edit the content.'),
- 'plugin_id' => 'node_link_edit',
+ 'id' => 'node_link_edit',
),
);
@@ -250,7 +250,7 @@ function node_views_data() {
'field' => array(
'title' => t('Delete link'),
'help' => t('Provide a simple link to delete the content.'),
- 'plugin_id' => 'node_link_delete',
+ 'id' => 'node_link_delete',
),
);
@@ -258,7 +258,7 @@ function node_views_data() {
'field' => array(
'title' => t('Path'),
'help' => t('The aliased path to this content.'),
- 'plugin_id' => 'node_path',
+ 'id' => 'node_path',
),
);
@@ -270,7 +270,7 @@ function node_views_data() {
'help' => t('Date in the form of CCYYMMDD.'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_fulldate',
+ 'id' => 'node_created_fulldate',
),
);
@@ -279,7 +279,7 @@ function node_views_data() {
'help' => t('Date in the form of YYYYMM.'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_year_month',
+ 'id' => 'node_created_year_month',
),
);
@@ -288,7 +288,7 @@ function node_views_data() {
'help' => t('Date in the form of YYYY.'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_year',
+ 'id' => 'node_created_year',
),
);
@@ -297,7 +297,7 @@ function node_views_data() {
'help' => t('Date in the form of MM (01 - 12).'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_month',
+ 'id' => 'node_created_month',
),
);
@@ -306,7 +306,7 @@ function node_views_data() {
'help' => t('Date in the form of DD (01 - 31).'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_day',
+ 'id' => 'node_created_day',
),
);
@@ -315,7 +315,7 @@ function node_views_data() {
'help' => t('Date in the form of WW (01 - 53).'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_week',
+ 'id' => 'node_created_week',
),
);
@@ -324,7 +324,7 @@ function node_views_data() {
'help' => t('Date in the form of CCYYMMDD.'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_fulldate',
+ 'id' => 'node_created_fulldate',
),
);
@@ -333,7 +333,7 @@ function node_views_data() {
'help' => t('Date in the form of YYYYMM.'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_year_month',
+ 'id' => 'node_created_year_month',
),
);
@@ -342,7 +342,7 @@ function node_views_data() {
'help' => t('Date in the form of YYYY.'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_year',
+ 'id' => 'node_created_year',
),
);
@@ -351,7 +351,7 @@ function node_views_data() {
'help' => t('Date in the form of MM (01 - 12).'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_month',
+ 'id' => 'node_created_month',
),
);
@@ -360,7 +360,7 @@ function node_views_data() {
'help' => t('Date in the form of DD (01 - 31).'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_day',
+ 'id' => 'node_created_day',
),
);
@@ -369,7 +369,7 @@ function node_views_data() {
'help' => t('Date in the form of WW (01 - 53).'),
'argument' => array(
'field' => 'changed',
- 'plugin_id' => 'node_created_week',
+ 'id' => 'node_created_week',
),
);
@@ -380,19 +380,19 @@ function node_views_data() {
'relationship' => array(
'title' => t('Author'),
'help' => t('Relate content to the user who created it.'),
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'base' => 'users',
'field' => 'uid',
'label' => t('author'),
),
'filter' => array(
- 'plugin_id' => 'user_name',
+ 'id' => 'user_name',
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'field' => array(
- 'plugin_id' => 'user',
+ 'id' => 'user',
),
);
@@ -401,10 +401,10 @@ function node_views_data() {
'help' => t('All nodes where a certain user has a revision'),
'real field' => 'nid',
'filter' => array(
- 'plugin_id' => 'node_uid_revision',
+ 'id' => 'node_uid_revision',
),
'argument' => array(
- 'plugin_id' => 'node_uid_revision',
+ 'id' => 'node_uid_revision',
),
);
@@ -450,7 +450,7 @@ function node_views_data() {
'title' => t('User'),
'help' => t('Relate a content revision to the user who created the revision.'),
'relationship' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'base' => 'users',
'base field' => 'uid',
'label' => t('revision user'),
@@ -467,20 +467,20 @@ function node_views_data() {
),
// Information for accepting a nid as an argument
'argument' => array(
- 'plugin_id' => 'node_vid',
+ 'id' => 'node_vid',
'click sortable' => TRUE,
'numeric' => TRUE,
),
// Information for accepting a nid as a filter
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
// Information for sorting on a nid.
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'relationship' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'base' => 'node',
'base field' => 'vid',
'title' => t('Content'),
@@ -495,17 +495,17 @@ function node_views_data() {
// Information for displaying a title as a field
'field' => array(
'field' => 'title', // the real field
- 'plugin_id' => 'node_revision',
+ 'id' => 'node_revision',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -515,10 +515,10 @@ function node_views_data() {
'help' => t('The log message entered when the revision was created.'), // The help that appears on the UI,
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'xss',
+ 'id' => 'xss',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -528,14 +528,14 @@ function node_views_data() {
'title' => t('Updated date'), // The item it appears as on the UI,
'help' => t('The date the node was last updated.'), // The help that appears on the UI,
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date'
+ 'id' => 'date'
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -543,7 +543,7 @@ function node_views_data() {
'field' => array(
'title' => t('Link'),
'help' => t('Provide a simple link to the revision.'),
- 'plugin_id' => 'node_revision_link',
+ 'id' => 'node_revision_link',
),
);
@@ -551,7 +551,7 @@ function node_views_data() {
'field' => array(
'title' => t('Revert link'),
'help' => t('Provide a simple link to revert to the revision.'),
- 'plugin_id' => 'node_revision_link_revert',
+ 'id' => 'node_revision_link_revert',
),
);
@@ -559,7 +559,7 @@ function node_views_data() {
'field' => array(
'title' => t('Delete link'),
'help' => t('Provide a simple link to delete the content revision.'),
- 'plugin_id' => 'node_revision_link_delete',
+ 'id' => 'node_revision_link_delete',
),
);
@@ -583,7 +583,7 @@ function node_views_data() {
'title' => t('Access'),
'help' => t('Filter by access.'),
'filter' => array(
- 'plugin_id' => 'node_access',
+ 'id' => 'node_access',
'help' => t('Filter for content by view access. <strong>Not necessary if you are using node as your base table.</strong>'),
),
);
@@ -613,12 +613,12 @@ function node_views_data() {
$data['history']['timestamp'] = array(
'title' => t('Has new content'),
'field' => array(
- 'plugin_id' => 'node_history_user_timestamp',
+ 'id' => 'node_history_user_timestamp',
'help' => t('Show a marker if the content is new or updated.'),
),
'filter' => array(
'help' => t('Show only content that is new or updated.'),
- 'plugin_id' => 'node_history_user_timestamp',
+ 'id' => 'node_history_user_timestamp',
),
);
return $data;
diff --git a/modules/poll.views.inc b/modules/poll.views.inc
index 8910b7f22dd8d397623f9a406588b3c46ba1ceee..718ff289b2b5e9df4797dd2e36e282b35150050f 100644
--- a/modules/poll.views.inc
+++ b/modules/poll.views.inc
@@ -30,16 +30,16 @@ function poll_views_data() {
'title' => t('Active'),
'help' => t('Whether the poll is open for voting.'),
'field' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'label' => t('Active'),
'type' => 'yes-no',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
diff --git a/modules/search.views.inc b/modules/search.views.inc
index b3ae5da4865bad1157a01811518a160382a699bb..03edc4b126f5dae883c2586cdedf7fbf321f0e8f 100644
--- a/modules/search.views.inc
+++ b/modules/search.views.inc
@@ -63,14 +63,14 @@ function search_views_data() {
'title' => t('Score'),
'help' => t('The score of the search item. This will not be used if the search filter is not also present.'),
'field' => array(
- 'plugin_id' => 'search_score',
+ 'id' => 'search_score',
'click sortable' => TRUE,
'float' => TRUE,
'no group by' => TRUE,
),
// Information for sorting on a search score.
'sort' => array(
- 'plugin_id' => 'search_score',
+ 'id' => 'search_score',
'no group by' => TRUE,
),
);
@@ -86,10 +86,10 @@ function search_views_data() {
'title' => t('Links from'),
'help' => t('Other nodes that are linked from the node.'),
'argument' => array(
- 'plugin_id' => 'node_nid',
+ 'id' => 'node_nid',
),
'filter' => array(
- 'plugin_id' => 'equality',
+ 'id' => 'equality',
),
);
@@ -104,10 +104,10 @@ function search_views_data() {
'title' => t('Links to'),
'help' => t('Other nodes that link to the node.'),
'argument' => array(
- 'plugin_id' => 'node_nid',
+ 'id' => 'node_nid',
),
'filter' => array(
- 'plugin_id' => 'equality',
+ 'id' => 'equality',
),
);
@@ -117,11 +117,11 @@ function search_views_data() {
'help' => t('The terms to search for.'), // The help that appears on the UI,
// Information for searching terms using the full search syntax
'filter' => array(
- 'plugin_id' => 'search',
+ 'id' => 'search',
'no group by' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'search',
+ 'id' => 'search',
'no group by' => TRUE,
),
);
diff --git a/modules/statistics.views.inc b/modules/statistics.views.inc
index af0b707b3db373e740345af48753f6445c4ffded..4bd0253f050fbe4c03d217cc13f57d4fb0265eaa 100644
--- a/modules/statistics.views.inc
+++ b/modules/statistics.views.inc
@@ -32,14 +32,14 @@ function statistics_views_data() {
'help' => t('The total number of times the node has been viewed.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -49,14 +49,14 @@ function statistics_views_data() {
'help' => t('The total number of times the node has been viewed today.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -66,14 +66,14 @@ function statistics_views_data() {
'help' => t('The most recent time the node has been viewed.'),
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -104,19 +104,19 @@ function statistics_views_data() {
'title' => t('Aid'),
'help' => t('Unique access event ID.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'name field' => 'wid',
'numeric' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -126,17 +126,17 @@ function statistics_views_data() {
'help' => t('Browser session ID of user that visited page.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -146,17 +146,17 @@ function statistics_views_data() {
'help' => t('Title of page visited.'),
'field' => array(
- 'plugin_id' => 'statistics_accesslog_path',
+ 'id' => 'statistics_accesslog_path',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'argument' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -166,14 +166,14 @@ function statistics_views_data() {
'help' => t('Internal path to page visited (relative to Drupal root.)'),
'field' => array(
- 'plugin_id' => 'statistics_accesslog_path',
+ 'id' => 'statistics_accesslog_path',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
//No argument here. Can't send forward slashes as arguments.
//Can be worked around by node ID.
@@ -185,14 +185,14 @@ function statistics_views_data() {
'title' => t('Referrer'),
'help' => t('Referrer URI.'),
'field' => array(
- 'plugin_id' => 'url',
+ 'id' => 'url',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -201,17 +201,17 @@ function statistics_views_data() {
'title' => t('Hostname'),
'help' => t('Hostname of user that visited the page.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -220,7 +220,7 @@ function statistics_views_data() {
'title' => t('User'),
'help' => t('The user who visited the site.'),
'relationship' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'base' => 'users',
'base field' => 'uid',
),
@@ -231,14 +231,14 @@ function statistics_views_data() {
'title' => t('Timer'),
'help' => t('Time in milliseconds that the page took to load.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -247,14 +247,14 @@ function statistics_views_data() {
'title' => t('Timestamp'),
'help' => t('Timestamp of when the page was visited.'),
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
diff --git a/modules/system.views.inc b/modules/system.views.inc
index fffd0857afa787a40d80f5cb54f64a9e5e821ea7..a431df8a4981ed1cc06b2c96d57f3927d1897113 100644
--- a/modules/system.views.inc
+++ b/modules/system.views.inc
@@ -35,19 +35,19 @@ function system_views_data() {
'title' => t('File ID'),
'help' => t('The ID of the file.'),
'field' => array(
- 'plugin_id' => 'file',
+ 'id' => 'file',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'file_fid',
+ 'id' => 'file_fid',
'name field' => 'filename', // the field to display in the summary.
'numeric' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -56,17 +56,17 @@ function system_views_data() {
'title' => t('Name'),
'help' => t('The name of the file.'),
'field' => array(
- 'plugin_id' => 'file',
+ 'id' => 'file',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -75,17 +75,17 @@ function system_views_data() {
'title' => t('Path'),
'help' => t('The path of the file.'),
'field' => array(
- 'plugin_id' => 'file_uri',
+ 'id' => 'file_uri',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -94,17 +94,17 @@ function system_views_data() {
'title' => t('Mime type'),
'help' => t('The mime type of the file.'),
'field' => array(
- 'plugin_id' => 'file_filemime',
+ 'id' => 'file_filemime',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -114,7 +114,7 @@ function system_views_data() {
'help' => t('The extension of the file.'),
'real field' => 'filename',
'field' => array(
- 'plugin_id' => 'field_file_extension',
+ 'id' => 'field_file_extension',
'click sortable' => FALSE,
),
);
@@ -124,14 +124,14 @@ function system_views_data() {
'title' => t('Size'),
'help' => t('The size of the file.'),
'field' => array(
- 'plugin_id' => 'field_file_size',
+ 'id' => 'field_file_size',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
);
@@ -140,14 +140,14 @@ function system_views_data() {
'title' => t('Status'),
'help' => t('The status of the file.'),
'field' => array(
- 'plugin_id' => 'field_file_status',
+ 'id' => 'field_file_status',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'filter_file_status',
+ 'id' => 'filter_file_status',
),
);
@@ -156,14 +156,14 @@ function system_views_data() {
'title' => t('Upload date'),
'help' => t('The date the file was uploaded.'),
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date'
+ 'id' => 'date'
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -391,65 +391,65 @@ function system_views_data() {
'title' => t('Module'),
'help' => t('The module managing this file relationship.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
$data['file_usage']['type'] = array(
'title' => t('Entity type'),
'help' => t('The type of entity that is related to the file.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
$data['file_usage']['id'] = array(
'title' => t('Entity ID'),
'help' => t('The ID of the entity that is related to the file.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
$data['file_usage']['count'] = array(
'title' => t('Use count'),
'help' => t('The number of times the file is used by this entity.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -470,18 +470,18 @@ function system_views_data() {
'title' => t('Module/Theme/Theme engine filename'),
'help' => t('The path of the primary file for this item, relative to the Drupal root; e.g. modules/node/node.module.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
'name field' => 'filename', // the field to display in the summary.
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
// - name
@@ -489,18 +489,18 @@ function system_views_data() {
'title' => t('Module/Theme/Theme engine name'),
'help' => t('The name of the item; e.g. node.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
'name field' => 'name', // the field to display in the summary.
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
// - type
@@ -508,18 +508,18 @@ function system_views_data() {
'title' => t('Type'),
'help' => t('The type of the item, either module, theme, or theme_engine.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
'name field' => 'type', // the field to display in the summary.
),
'filter' => array(
- 'plugin_id' => 'filter_system_type',
+ 'id' => 'filter_system_type',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
// - status
@@ -527,18 +527,18 @@ function system_views_data() {
'title' => t('Status'),
'help' => t('Boolean indicating whether or not this item is enabled.'),
'field' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'name field' => 'status', // the field to display in the summary.
),
'filter' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
// - schema version
@@ -546,18 +546,18 @@ function system_views_data() {
'title' => t('Schema version'),
'help' => t("The module's database schema version number. -1 if the module is not installed (its tables do not exist); 0 or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed."),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'name field' => 'schema_version', // the field to display in the summary.
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
diff --git a/modules/taxonomy.views.inc b/modules/taxonomy.views.inc
index 4232fcdf22b364445ac612ac1047986ea29e2e21..7134e94717cd1d9b86cc1a84cd217ef06394ed41 100644
--- a/modules/taxonomy.views.inc
+++ b/modules/taxonomy.views.inc
@@ -40,11 +40,11 @@ function taxonomy_views_data() {
'title' => t('Name'), // The item it appears as on the UI,
'field' => array(
'help' => t('Name of the vocabulary a term is a member of. This will be the vocabulary that whichever term the "Taxonomy: Term" field is; and can similarly cause duplicates.'),
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'help' => t('The taxonomy vocabulary name'),
),
);
@@ -52,56 +52,56 @@ function taxonomy_views_data() {
'title' => t('Machine name'), // The item it appears as on the UI,
'field' => array(
'help' => t('Machine-Name of the vocabulary a term is a member of. This will be the vocabulary that whichever term the "Taxonomy: Term" field is; and can similarly cause duplicates.'),
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE,
),
'filter' => array(
'help' => t('Filter the results of "Taxonomy: Term" to a particular vocabulary.'),
- 'plugin_id' => 'vocabulary_machine_name',
+ 'id' => 'vocabulary_machine_name',
),
'argument' => array(
'help' => t('Filter the results of "Taxonomy: Term" to a particular vocabulary.'),
- 'plugin_id' => 'vocabulary_machine_name',
+ 'id' => 'vocabulary_machine_name',
),
);
$data['taxonomy_vocabulary']['vid'] = array(
'title' => t('Vocabulary ID'), // The item it appears as on the UI,
'help' => t('The taxonomy vocabulary ID'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'vocabulary_vid',
+ 'id' => 'vocabulary_vid',
'name field' => 'name',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
$data['taxonomy_vocabulary']['description'] = array(
'title' => t('Description'), // The item it appears as on the UI,
'help' => t('The taxonomy vocabulary description'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
$data['taxonomy_vocabulary']['weight'] = array(
'title' => t('Weight'),
'help' => t('The taxonomy vocabulary weight'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'name field' => 'weight',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
);
@@ -146,21 +146,21 @@ function taxonomy_views_data() {
'title' => t('Term ID'),
'help' => t('The tid of a taxonomy term.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'argument' => array(
- 'plugin_id' => 'taxonomy',
+ 'id' => 'taxonomy',
'name field' => 'name',
'zero is null' => TRUE,
),
'filter' => array(
'title' => t('Term'),
'help' => t('Taxonomy term chosen from autocomplete or select widget.'),
- 'plugin_id' => 'taxonomy_index_tid',
+ 'id' => 'taxonomy_index_tid',
'hierarchy table' => 'taxonomy_term_hierarchy',
'numeric' => TRUE,
),
@@ -172,7 +172,7 @@ function taxonomy_views_data() {
'help' => t('The tid of a taxonomy term.'),
'real field' => 'tid',
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'allow empty' => TRUE,
),
);
@@ -182,7 +182,7 @@ function taxonomy_views_data() {
'title' => t('Representative node'),
'label' => t('Representative node'),
'help' => t('Obtains a single representative node for each term, according to a chosen sort criterion.'),
- 'plugin_id' => 'groupwise_max',
+ 'id' => 'groupwise_max',
'relationship field' => 'tid',
'outer field' => 'taxonomy_term_data.tid',
'argument table' => 'taxonomy_term_data',
@@ -197,18 +197,18 @@ function taxonomy_views_data() {
'title' => t('Name'),
'help' => t('The taxonomy term name.'),
'field' => array(
- 'plugin_id' => 'taxonomy',
+ 'id' => 'taxonomy',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
'help' => t('Taxonomy term name.'),
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
'help' => t('Taxonomy term name.'),
'many to one' => TRUE,
'empty field name' => t('Uncategorized'),
@@ -220,17 +220,17 @@ function taxonomy_views_data() {
'title' => t('Weight'),
'help' => t('The term weight field'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
);
@@ -239,11 +239,11 @@ function taxonomy_views_data() {
'title' => t('Term description'),
'help' => t('The description associated with a taxonomy term.'),
'field' => array(
- 'plugin_id' => 'markup',
+ 'id' => 'markup',
'format' => array('field' => 'format'),
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -252,7 +252,7 @@ function taxonomy_views_data() {
'title' => t('Vocabulary'),
'help' => t('Filter the results of "Taxonomy: Term" to a particular vocabulary.'),
'filter' => array(
- 'plugin_id' => 'vocabulary_vid',
+ 'id' => 'vocabulary_vid',
),
);
@@ -261,7 +261,7 @@ function taxonomy_views_data() {
'field' => array(
'title' => t('Term edit link'),
'help' => t('Provide a simple link to edit the term.'),
- 'plugin_id' => 'term_link_edit',
+ 'id' => 'term_link_edit',
),
);
@@ -292,7 +292,7 @@ function taxonomy_views_data() {
'title' => t('Content with term'),
'help' => t('Relate all content tagged with a term.'),
'relationship' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'base' => 'node',
'base field' => 'nid',
'label' => t('node'),
@@ -308,7 +308,7 @@ function taxonomy_views_data() {
'title' => t('Has taxonomy term ID'),
'help' => t('Display content if it has the selected taxonomy terms.'),
'argument' => array(
- 'plugin_id' => 'taxonomy_index_tid',
+ 'id' => 'taxonomy_index_tid',
'name table' => 'taxonomy_term_data',
'name field' => 'name',
'empty field name' => t('Uncategorized'),
@@ -317,7 +317,7 @@ function taxonomy_views_data() {
),
'filter' => array(
'title' => t('Has taxonomy term'),
- 'plugin_id' => 'taxonomy_index_tid',
+ 'id' => 'taxonomy_index_tid',
'hierarchy table' => 'taxonomy_term_hierarchy',
'numeric' => TRUE,
'skip base' => 'taxonomy_term_data',
@@ -366,7 +366,7 @@ function taxonomy_views_data() {
),
'argument' => array(
'help' => t('The parent term of the term.'),
- 'plugin_id' => 'taxonomy',
+ 'id' => 'taxonomy',
),
);
@@ -381,14 +381,14 @@ function taxonomy_views_data_alter(&$data) {
'title' => t('Taxonomy terms on node'),
'help' => t('Relate nodes to taxonomy terms, specifiying which vocabulary or vocabularies to use. This relationship will cause duplicated records if there are multiple terms.'),
'relationship' => array(
- 'plugin_id' => 'node_term_data',
+ 'id' => 'node_term_data',
'label' => t('term'),
'base' => 'taxonomy_term_data',
),
'field' => array(
'title' => t('All taxonomy terms'),
'help' => t('Display all taxonomy terms associated with a node from specified vocabularies.'),
- 'plugin_id' => 'taxonomy_index_tid',
+ 'id' => 'taxonomy_index_tid',
'no group by' => TRUE,
),
);
@@ -398,12 +398,12 @@ function taxonomy_views_data_alter(&$data) {
'real field' => 'nid',
'argument' => array(
'title' => t('Has taxonomy term ID (with depth)'),
- 'plugin_id' => 'taxonomy_index_tid_depth',
+ 'id' => 'taxonomy_index_tid_depth',
'accept depth modifier' => TRUE,
),
'filter' => array(
'title' => t('Has taxonomy terms (with depth)'),
- 'plugin_id' => 'taxonomy_index_tid_depth',
+ 'id' => 'taxonomy_index_tid_depth',
),
);
@@ -411,7 +411,7 @@ function taxonomy_views_data_alter(&$data) {
'title' => t('Has taxonomy term ID depth modifier'),
'help' => t('Allows the "depth" for Taxonomy: Term ID (with depth) to be modified via an additional contextual filter value.'),
'argument' => array(
- 'plugin_id' => 'taxonomy_index_tid_depth_modifier',
+ 'id' => 'taxonomy_index_tid_depth_modifier',
),
);
}
@@ -429,14 +429,14 @@ function taxonomy_field_views_data($field) {
foreach ($data as $table_name => $table_data) {
foreach ($table_data as $field_name => $field_data) {
if (isset($field_data['filter']) && $field_name != 'delta') {
- $data[$table_name][$field_name]['filter']['plugin_id'] = 'taxonomy_index_tid';
+ $data[$table_name][$field_name]['filter']['id'] = 'taxonomy_index_tid';
$data[$table_name][$field_name]['filter']['vocabulary'] = $field['settings']['allowed_values'][0]['vocabulary'];
}
}
// Add the relationship only on the tid field.
$data[$table_name][$field['field_name'] . '_tid']['relationship'] = array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'base' => 'taxonomy_term_data',
'base field' => 'tid',
'label' => t('term from !field_name', array('!field_name' => $field['field_name'])),
@@ -466,7 +466,7 @@ function taxonomy_field_views_data_views_data_alter(&$data, $field) {
$data['taxonomy_term_data'][$pseudo_field_name]['relationship'] = array(
'title' => t('@entity using @field', array('@entity' => $entity, '@field' => $label)),
'help' => t('Relate each @entity with a @field set to the term.', array('@entity' => $entity, '@field' => $label)),
- 'plugin_id' => 'entity_reverse',
+ 'id' => 'entity_reverse',
'field_name' => $field['field_name'],
'field table' => _field_sql_storage_tablename($field),
'field field' => $field['field_name'] . '_tid',
diff --git a/modules/translation.views.inc b/modules/translation.views.inc
index c55e513e70e215d518cef00328e8f3f56640848c..7f28fa50c8adc85bd0b30626dc195c5eeb74b57f 100644
--- a/modules/translation.views.inc
+++ b/modules/translation.views.inc
@@ -26,27 +26,27 @@ function translation_views_data_alter(&$data) {
'title' => t('Translation set node ID'),
'help' => t('The ID of the translation set the content belongs to.'),
'field' => array(
- 'plugin_id' => 'node',
+ 'id' => 'node',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'argument' => array(
- 'plugin_id' => 'node_tnid',
+ 'id' => 'node_tnid',
'name field' => 'title', // the field to display in the summary.
'numeric' => TRUE,
'validate type' => 'tnid',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'relationship' => array(
'title' => t('Source translation'),
'help' => t('The source that this content was translated from.'),
'base' => 'node',
'base field' => 'nid',
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'label' => t('Source translation'),
),
);
@@ -63,7 +63,7 @@ function translation_views_data_alter(&$data) {
'base field' => 'tnid',
'relationship table' => 'node',
'relationship field' => 'nid',
- 'plugin_id' => 'translation',
+ 'id' => 'translation',
'label' => t('Translations'),
),
);
@@ -74,7 +74,7 @@ function translation_views_data_alter(&$data) {
'title' => t('Source translation'),
'help' => t('Content that is either untranslated or is the original version of a translation set.'),
'filter' => array(
- 'plugin_id' => 'node_tnid',
+ 'id' => 'node_tnid',
),
);
@@ -84,7 +84,7 @@ function translation_views_data_alter(&$data) {
'title' => t('Child translation'),
'help' => t('Content that is a translation of a source translation.'),
'filter' => array(
- 'plugin_id' => 'node_tnid_child',
+ 'id' => 'node_tnid_child',
),
);
@@ -94,16 +94,16 @@ function translation_views_data_alter(&$data) {
'title' => t('Translation status'),
'help' => t('The translation status of the content - whether or not the translation needs to be updated.'),
'field' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'label' => t('Outdated'),
'type' => 'yes-no',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -113,7 +113,7 @@ function translation_views_data_alter(&$data) {
'title' => t('Translate link'),
'help' => t('Provide a simple link to translate the node.'),
'field' => array(
- 'plugin_id' => 'node_link_translate',
+ 'id' => 'node_link_translate',
),
);
diff --git a/modules/user.views.inc b/modules/user.views.inc
index d236dc440892641f66a15b1632e6aadedae98201..38b2fcb04a15ec8c80fdee29bf3a982023960541 100644
--- a/modules/user.views.inc
+++ b/modules/user.views.inc
@@ -47,24 +47,24 @@ function user_views_data() {
'title' => t('Uid'),
'help' => t('The user ID'), // The help that appears on the UI,
'field' => array(
- 'plugin_id' => 'user',
+ 'id' => 'user',
'click sortable' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'user_uid',
+ 'id' => 'user_uid',
'name field' => 'name', // display this field in the summary
),
'filter' => array(
'title' => t('Name'),
- 'plugin_id' => 'user_name',
+ 'id' => 'user_name',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'relationship' => array(
'title' => t('Content authored'),
'help' => t('Relate content to the user who created it. This relationship will create one record for each content item created by the user.'),
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'base' => 'node',
'base field' => 'uid',
'field' => 'uid',
@@ -78,7 +78,7 @@ function user_views_data() {
'real field' => 'uid',
'filter' => array(
'title' => t('The user ID'),
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
);
@@ -88,7 +88,7 @@ function user_views_data() {
'title' => t('Representative node'),
'label' => t('Representative node'),
'help' => t('Obtains a single representative node for each user, according to a chosen sort criterion.'),
- 'plugin_id' => 'groupwise_max',
+ 'id' => 'groupwise_max',
'relationship field' => 'uid',
'outer field' => 'users.uid',
'argument table' => 'users',
@@ -104,7 +104,7 @@ function user_views_data() {
'title' => t('Current'),
'help' => t('Filter the view to the currently logged in user.'),
'filter' => array(
- 'plugin_id' => 'user_current',
+ 'id' => 'user_current',
'type' => 'yes-no',
),
);
@@ -114,17 +114,17 @@ function user_views_data() {
'title' => t('Name'), // The item it appears as on the UI,
'help' => t('The user or author name.'), // The help that appears on the UI,
'field' => array(
- 'plugin_id' => 'user_name',
+ 'id' => 'user_name',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
'title' => t('Name (raw)'),
'help' => t('The user or author name. This filter does not check if the user exists and allows partial matching. Does not utilize autocomplete.')
),
@@ -136,17 +136,17 @@ function user_views_data() {
'title' => t('E-mail'), // The item it appears as on the UI,
'help' => t('Email address for a given user. This field is normally not shown to users, so be cautious when using it.'), // The help that appears on the UI,
'field' => array(
- 'plugin_id' => 'user_mail',
+ 'id' => 'user_mail',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -155,17 +155,17 @@ function user_views_data() {
'title' => t('Language'), // The item it appears as on the UI,
'help' => t('Language of the user'),
'field' => array(
- 'plugin_id' => 'user_language',
+ 'id' => 'user_language',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'node_language',
+ 'id' => 'node_language',
),
'argument' => array(
- 'plugin_id' => 'node_language',
+ 'id' => 'node_language',
),
);
@@ -176,14 +176,14 @@ function user_views_data() {
'help' => t("The user's picture, if allowed."), // The help that appears on the UI,
// Information for displaying the uid
'field' => array(
- 'plugin_id' => 'user_picture',
+ 'id' => 'user_picture',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'label' => t('Has Avatar'),
'type' => 'yes-no',
),
@@ -194,7 +194,7 @@ function user_views_data() {
'field' => array(
'title' => t('Link'),
'help' => t('Provide a simple link to the user.'),
- 'plugin_id' => 'user_link',
+ 'id' => 'user_link',
),
);
@@ -203,14 +203,14 @@ function user_views_data() {
'title' => t('Created date'), // The item it appears as on the UI,
'help' => t('The date the user was created.'), // The help that appears on the UI,
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date'
+ 'id' => 'date'
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -219,7 +219,7 @@ function user_views_data() {
'help' => t('Date in the form of CCYYMMDD.'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_fulldate',
+ 'id' => 'node_created_fulldate',
),
);
@@ -228,7 +228,7 @@ function user_views_data() {
'help' => t('Date in the form of YYYYMM.'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_year_month',
+ 'id' => 'node_created_year_month',
),
);
@@ -238,7 +238,7 @@ function user_views_data() {
'help' => t('Date in the form of YYYY.'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_year',
+ 'id' => 'node_created_year',
),
);
@@ -247,7 +247,7 @@ function user_views_data() {
'help' => t('Date in the form of MM (01 - 12).'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_month',
+ 'id' => 'node_created_month',
),
);
@@ -256,7 +256,7 @@ function user_views_data() {
'help' => t('Date in the form of DD (01 - 31).'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_day',
+ 'id' => 'node_created_day',
),
);
@@ -265,7 +265,7 @@ function user_views_data() {
'help' => t('Date in the form of WW (01 - 53).'),
'argument' => array(
'field' => 'created',
- 'plugin_id' => 'node_created_week',
+ 'id' => 'node_created_week',
),
);
@@ -274,14 +274,14 @@ function user_views_data() {
'title' => t('Last access'), // The item it appears as on the UI,
'help' => t("The user's last access date."), // The help that appears on the UI,
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date'
+ 'id' => 'date'
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -290,14 +290,14 @@ function user_views_data() {
'title' => t('Last login'), // The item it appears as on the UI,
'help' => t("The user's last login date."), // The help that appears on the UI,
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date'
+ 'id' => 'date'
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -307,19 +307,19 @@ function user_views_data() {
'help' => t('Whether a user is active or blocked.'), // The help that appears on the UI,
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'click sortable' => TRUE,
'output formats' => array(
'active-blocked' => array(t('Active'), t('Blocked')),
),
),
'filter' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'label' => t('Active'),
'type' => 'yes-no',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -329,11 +329,11 @@ function user_views_data() {
'help' => t("The user's signature."), // The help that appears on the UI,
// Information for displaying a title as a field
'field' => array(
- 'plugin_id' => 'markup',
+ 'id' => 'markup',
'format' => filter_fallback_format(),
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -341,7 +341,7 @@ function user_views_data() {
'field' => array(
'title' => t('Edit link'),
'help' => t('Provide a simple link to edit the user.'),
- 'plugin_id' => 'user_link_edit',
+ 'id' => 'user_link_edit',
),
);
@@ -349,7 +349,7 @@ function user_views_data() {
'field' => array(
'title' => t('Cancel link'),
'help' => t('Provide a simple link to cancel the user.'),
- 'plugin_id' => 'user_link_cancel',
+ 'id' => 'user_link_cancel',
),
);
@@ -357,7 +357,7 @@ function user_views_data() {
'title' => t('Data'),
'help' => t('Provide serialized data of the user'),
'field' => array(
- 'plugin_id' => 'serialized',
+ 'id' => 'serialized',
),
);
@@ -390,15 +390,15 @@ function user_views_data() {
'title' => t('Roles'),
'help' => t('Roles that a user belongs to.'),
'field' => array(
- 'plugin_id' => 'user_roles',
+ 'id' => 'user_roles',
'no group by' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'user_roles',
+ 'id' => 'user_roles',
'allow empty' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'users_roles_rid',
+ 'id' => 'users_roles_rid',
'name table' => 'role',
'name field' => 'name',
'empty field name' => t('No role'),
@@ -450,11 +450,11 @@ function user_views_data() {
'title' => t('Permission'),
'help' => t('The user permissions.'),
'field' => array(
- 'plugin_id' => 'user_permissions',
+ 'id' => 'user_permissions',
'no group by' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'user_permissions',
+ 'id' => 'user_permissions',
),
);
@@ -485,14 +485,14 @@ function user_views_data() {
'title' => t('Authmap ID'),
'help' => t('The Authmap ID.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'numeric' => TRUE,
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'numeric' => TRUE,
),
);
@@ -500,26 +500,26 @@ function user_views_data() {
'title' => t('Authentication name'),
'help' => t('The unique authentication name.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
);
$data['authmap']['module'] = array(
'title' => t('Authentication module'),
'help' => t('The name of the module managing the authentication entry.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
diff --git a/modules/views.views.inc b/modules/views.views.inc
index 64e2209e110177525add1c46860acadd8fe4c0e4..c8f94c23ad4b2952544a1750d866aa5183062c99 100644
--- a/modules/views.views.inc
+++ b/modules/views.views.inc
@@ -21,7 +21,7 @@ function views_views_data() {
'title' => t('Random'),
'help' => t('Randomize the display order.'),
'sort' => array(
- 'plugin_id' => 'random',
+ 'id' => 'random',
),
);
@@ -29,7 +29,7 @@ function views_views_data() {
'title' => t('Null'),
'help' => t('Allow a contextual filter value to be ignored. The query will not be altered by this contextual filter value. Can be used when contextual filter values come from the URL, and a part of the URL needs to be ignored.'),
'argument' => array(
- 'plugin_id' => 'null',
+ 'id' => 'null',
),
);
@@ -37,7 +37,7 @@ function views_views_data() {
'title' => t('Custom text'),
'help' => t('Provide custom text or link.'),
'field' => array(
- 'plugin_id' => 'custom',
+ 'id' => 'custom',
),
);
@@ -45,7 +45,7 @@ function views_views_data() {
'title' => t('View result counter'),
'help' => t('Displays the actual position of the view result'),
'field' => array(
- 'plugin_id' => 'counter',
+ 'id' => 'counter',
),
);
@@ -53,7 +53,7 @@ function views_views_data() {
'title' => t('Text area'),
'help' => t('Provide markup text for the area.'),
'area' => array(
- 'plugin_id' => 'text',
+ 'id' => 'text',
),
);
@@ -61,7 +61,7 @@ function views_views_data() {
'title' => t('Unfiltered text'),
'help' => t('Add unrestricted, custom text or markup. This is similar to the custom text field.'),
'area' => array(
- 'plugin_id' => 'text_custom',
+ 'id' => 'text_custom',
),
);
@@ -69,7 +69,7 @@ function views_views_data() {
'title' => t('View area'),
'help' => t('Insert a view inside an area.'),
'area' => array(
- 'plugin_id' => 'view',
+ 'id' => 'view',
),
);
@@ -77,7 +77,7 @@ function views_views_data() {
'title' => t('Result summary'),
'help' => t('Shows result summary, for example the items per page.'),
'area' => array(
- 'plugin_id' => 'result',
+ 'id' => 'result',
),
);
@@ -86,7 +86,7 @@ function views_views_data() {
'title' => t('Contextual Links'),
'help' => t('Display fields in a contextual links menu.'),
'field' => array(
- 'plugin_id' => 'contextual_links',
+ 'id' => 'contextual_links',
),
);
}
@@ -95,7 +95,7 @@ function views_views_data() {
'title' => t('Combine fields filter'),
'help' => t('Combine two fields together and search by them.'),
'filter' => array(
- 'plugin_id' => 'combine',
+ 'id' => 'combine',
),
);
@@ -104,7 +104,7 @@ function views_views_data() {
'title' => t('Math expression'),
'help' => t('Evaluates a mathematical expression and displays it.'),
'field' => array(
- 'plugin_id' => 'math',
+ 'id' => 'math',
'float' => TRUE,
),
);
diff --git a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/DynamicTest.php b/tests/views_test/lib/Drupal/views_test/Plugin/views/access/DynamicTest.php
index 1d1a01cefe5844017271d379a0a37a99e440e279..877d0fd50abf6583020ebef8e23abd70742480a2 100644
--- a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/DynamicTest.php
+++ b/tests/views_test/lib/Drupal/views_test/Plugin/views/access/DynamicTest.php
@@ -15,7 +15,7 @@
* Tests a dynamic access plugin.
*
* @Plugin(
- * plugin_id = "test_dynamic",
+ * id = "test_dynamic",
* title = @Translation("Dynamic test access plugin."),
* help = @Translation("Provides a dynamic test access plugin.")
* )
diff --git a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/StaticTest.php b/tests/views_test/lib/Drupal/views_test/Plugin/views/access/StaticTest.php
index b12f015dee70fa3560ac0cea27618f01661dfeb1..4c89a6d7f2e5a21ff3fb06d101823e31310300f7 100644
--- a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/StaticTest.php
+++ b/tests/views_test/lib/Drupal/views_test/Plugin/views/access/StaticTest.php
@@ -15,7 +15,7 @@
* Tests a static access plugin.
*
* @Plugin(
- * plugin_id = "test_static",
+ * id = "test_static",
* title = @Translation("Static test access plugin"),
* help = @Translation("Provides a static test access plugin.")
* )
diff --git a/tests/views_test/lib/Drupal/views_test/Plugin/views/localization/LocalizationTest.php b/tests/views_test/lib/Drupal/views_test/Plugin/views/localization/LocalizationTest.php
index fe3138e94da72a24909facb63a9de1a42600775e..dfbf37252b7df151a0e7999fc7f7e0d056fa8b3a 100644
--- a/tests/views_test/lib/Drupal/views_test/Plugin/views/localization/LocalizationTest.php
+++ b/tests/views_test/lib/Drupal/views_test/Plugin/views/localization/LocalizationTest.php
@@ -15,7 +15,7 @@
* A stump localisation plugin which has static variables to cache the input.
*
* @Plugin(
- * plugin_id = "test_localization",
+ * id = "test_localization",
* title = @Translation("Test."),
* help = @Translation("This is a test description."),
* no_uid = TRUE
diff --git a/views.api.php b/views.api.php
index cce8444e02cd18425fb3c1eed09d3df8b7b8f6de..14c258bc51695882bb4fe503ebc4c9293488f310 100644
--- a/views.api.php
+++ b/views.api.php
@@ -374,7 +374,7 @@ function hook_views_data() {
'relationship' => array(
'base' => 'node', // The name of the table to join with
'field' => 'nid', // The name of the field to join with
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'label' => t('Example node'),
),
);
@@ -384,17 +384,17 @@ function hook_views_data() {
'title' => t('Plain text field'),
'help' => t('Just a plain text field.'),
'field' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'click sortable' => TRUE, // This is use by the table display plugin.
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
'filter' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
'argument' => array(
- 'plugin_id' => 'string',
+ 'id' => 'string',
),
);
@@ -403,14 +403,14 @@ function hook_views_data() {
'title' => t('Numeric field'),
'help' => t('Just a numeric field.'),
'field' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'numeric',
+ 'id' => 'numeric',
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -419,11 +419,11 @@ function hook_views_data() {
'title' => t('Boolean field'),
'help' => t('Just an on/off field.'),
'field' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
'click sortable' => TRUE,
),
'filter' => array(
- 'plugin_id' => 'boolean',
+ 'id' => 'boolean',
// Note that you can override the field-wide label:
'label' => t('Published'),
// This setting is used by the boolean filter handler, as possible option.
@@ -432,7 +432,7 @@ function hook_views_data() {
'use equal' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
),
);
@@ -441,14 +441,14 @@ function hook_views_data() {
'title' => t('Timestamp field'),
'help' => t('Just a timestamp field.'),
'field' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
'click sortable' => TRUE,
),
'sort' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
'filter' => array(
- 'plugin_id' => 'date',
+ 'id' => 'date',
),
);
@@ -498,7 +498,7 @@ function hook_views_data_alter(&$data) {
'base' => 'example_table', // Table we're joining to.
'base field' => 'eid', // Field on the joined table.
'field' => 'fid', // Real field name on the 'foo' table.
- 'plugin_id' => 'standard',
+ 'id' => 'standard',
'label' => t('Default label for relationship'),
'title' => t('Title seen when adding relationship'),
'help' => t('More information about relationship.'),
diff --git a/views.module b/views.module
index 836e6c6483f28771c6933c86346b4832db4282fe..056ad2133c7ccb0e043b27a58cb0323de07cb088 100644
--- a/views.module
+++ b/views.module
@@ -1270,9 +1270,9 @@ function views_get_handler($table, $field, $key, $override = NULL) {
}
// @fixme: temporary.
- // Set up a default handler, if both handler and plugin_id is not specified.
- if (empty($data[$field][$key]['handler']) && empty($data[$field][$key]['plugin_id'])) {
- $data[$field][$key]['plugin_id'] = 'standard';
+ // Set up a default handler, if both handler and id is not specified.
+ if (empty($data[$field][$key]['handler']) && empty($data[$field][$key]['id'])) {
+ $data[$field][$key]['id'] = 'standard';
}
$handler = _views_prepare_handler($data[$field][$key], $data, $field, $key);
@@ -1286,7 +1286,7 @@ function views_get_handler($table, $field, $key, $override = NULL) {
vpr("Missing handler: @table @field @key", array('@table' => $table, '@field' => $field, '@key' => $key));
$broken = array(
'title' => t('Broken handler @table.@field', array('@table' => $table, '@field' => $field)),
- 'plugin_id' => 'broken',
+ 'id' => 'broken',
'table' => $table,
'field' => $field,
);
@@ -1307,9 +1307,9 @@ function views_fetch_data($table = NULL, $move = TRUE, $reset = FALSE) {
/**
* Fetch the plugin data from cache.
*/
-function views_fetch_plugin_data($type = NULL, $plugin_id = NULL, $reset = FALSE) {
+function views_fetch_plugin_data($type = NULL, $id = NULL, $reset = FALSE) {
views_include('cache');
- return _views_fetch_plugin_data($type, $plugin_id, $reset);
+ return _views_fetch_plugin_data($type, $id, $reset);
}
/**
@@ -1331,14 +1331,14 @@ function views_fetch_plugin_names($type, $key = NULL, $base = array()) {
$definitions = $manager->getDefinitions();
$plugins = array();
- foreach ($definitions as $plugin_id => $plugin) {
+ foreach ($definitions as $id => $plugin) {
// Skip plugins that don't conform to our key.
if ($key && (empty($plugin['type']) || $plugin['type'] != $key)) {
continue;
}
if (empty($plugin['no ui']) && (empty($base) || empty($plugin['base']) || array_intersect($base, $plugin['base']))) {
- $plugins[$plugin_id] = $plugin['title'];
+ $plugins[$id] = $plugin['title'];
}
}
@@ -1356,18 +1356,18 @@ function views_fetch_plugin_names($type, $key = NULL, $base = array()) {
*
* @param string $type
* The plugin type like access or display.
- * @param string $plugin_id
+ * @param string $id
* The name of the plugin like standard.
*
* @return views_plugin
*
* The created plugin object.
*/
-function views_get_plugin($type, $plugin_id, $reset = FALSE) {
+function views_get_plugin($type, $id, $reset = FALSE) {
views_include('handlers');
$manager = new ViewsPluginManager($type);
- $definition = $manager->getDefinition($plugin_id);
+ $definition = $manager->getDefinition($id);
if (!empty($definition)) {
return _views_create_plugin($type, $definition);
}