From 81b16bb29f6d7a3c0a66273bc6e461e17b9d73a9 Mon Sep 17 00:00:00 2001 From: Bram Goffings <bramgoffings@gmail.com> Date: Sat, 11 Aug 2012 13:46:07 +0200 Subject: [PATCH] renamed plugin_id to id --- help/api-example.html | 14 +- includes/admin.inc | 4 +- includes/cache.inc | 8 +- includes/handlers.inc | 6 +- .../views/Plugin/Discovery/ViewsDiscovery.php | 2 +- lib/Drupal/views/Plugin/views/Plugin.php | 4 +- lib/Drupal/views/Plugin/views/access/None.php | 2 +- .../views/Plugin/views/access/Permission.php | 2 +- lib/Drupal/views/Plugin/views/access/Role.php | 2 +- lib/Drupal/views/Plugin/views/area/Broken.php | 2 +- lib/Drupal/views/Plugin/views/area/Result.php | 2 +- lib/Drupal/views/Plugin/views/area/Text.php | 2 +- .../views/Plugin/views/area/TextCustom.php | 2 +- lib/Drupal/views/Plugin/views/area/View.php | 2 +- .../views/Plugin/views/argument/Broken.php | 2 +- .../views/Plugin/views/argument/Date.php | 2 +- .../views/Plugin/views/argument/Formula.php | 2 +- .../Plugin/views/argument/GroupByNumeric.php | 2 +- .../views/Plugin/views/argument/ManyToOne.php | 2 +- .../views/Plugin/views/argument/Null.php | 2 +- .../views/Plugin/views/argument/Numeric.php | 2 +- .../views/Plugin/views/argument/String.php | 2 +- .../Plugin/views/argument_default/Fixed.php | 2 +- .../Plugin/views/argument_default/Php.php | 2 +- .../Plugin/views/argument_default/Raw.php | 2 +- .../views/argument_validator/Numeric.php | 2 +- .../Plugin/views/argument_validator/Php.php | 2 +- lib/Drupal/views/Plugin/views/cache/None.php | 2 +- lib/Drupal/views/Plugin/views/cache/Time.php | 2 +- .../views/Plugin/views/display/Attachment.php | 2 +- .../views/Plugin/views/display/Block.php | 2 +- .../Plugin/views/display/DefaultDisplay.php | 2 +- .../views/Plugin/views/display/Embed.php | 2 +- .../views/Plugin/views/display/Feed.php | 2 +- .../views/Plugin/views/display/Page.php | 2 +- .../DefaultDisplayExtender.php | 2 +- .../views/Plugin/views/exposed_form/Basic.php | 2 +- .../views/exposed_form/InputRequired.php | 2 +- .../views/Plugin/views/field/Boolean.php | 2 +- .../views/Plugin/views/field/Broken.php | 2 +- .../Plugin/views/field/ContextualLinks.php | 2 +- .../views/Plugin/views/field/Counter.php | 2 +- .../views/Plugin/views/field/Custom.php | 2 +- lib/Drupal/views/Plugin/views/field/Date.php | 2 +- .../views/Plugin/views/field/Entity.php | 2 +- .../Plugin/views/field/FieldPluginBase.php | 2 +- .../views/Plugin/views/field/FileSize.php | 2 +- .../views/Plugin/views/field/MachineName.php | 2 +- .../views/Plugin/views/field/Markup.php | 2 +- lib/Drupal/views/Plugin/views/field/Math.php | 2 +- .../views/Plugin/views/field/Numeric.php | 2 +- .../Plugin/views/field/PrerenderList.php | 2 +- .../views/Plugin/views/field/Serialized.php | 2 +- .../views/Plugin/views/field/TimeInterval.php | 2 +- lib/Drupal/views/Plugin/views/field/Url.php | 2 +- lib/Drupal/views/Plugin/views/field/Xss.php | 2 +- .../Plugin/views/filter/BooleanOperator.php | 2 +- .../views/filter/BooleanOperatorString.php | 2 +- .../views/Plugin/views/filter/Broken.php | 2 +- .../views/Plugin/views/filter/Combine.php | 2 +- lib/Drupal/views/Plugin/views/filter/Date.php | 2 +- .../views/Plugin/views/filter/Equality.php | 2 +- .../Plugin/views/filter/FilterPluginBase.php | 2 +- .../Plugin/views/filter/GroupByNumeric.php | 2 +- .../views/Plugin/views/filter/InOperator.php | 2 +- .../views/Plugin/views/filter/ManyToOne.php | 2 +- .../views/Plugin/views/filter/Numeric.php | 2 +- .../views/Plugin/views/filter/String.php | 2 +- .../views/Plugin/views/localization/Core.php | 2 +- .../views/Plugin/views/localization/None.php | 2 +- lib/Drupal/views/Plugin/views/pager/Full.php | 2 +- lib/Drupal/views/Plugin/views/pager/Mini.php | 2 +- lib/Drupal/views/Plugin/views/pager/None.php | 2 +- lib/Drupal/views/Plugin/views/pager/Some.php | 2 +- lib/Drupal/views/Plugin/views/query/Sql.php | 2 +- .../Plugin/views/relationship/Broken.php | 2 +- .../views/relationship/GroupwiseMax.php | 2 +- .../relationship/RelationshipPluginBase.php | 2 +- lib/Drupal/views/Plugin/views/row/Fields.php | 2 +- .../views/Plugin/views/row/RssFields.php | 2 +- lib/Drupal/views/Plugin/views/sort/Broken.php | 2 +- lib/Drupal/views/Plugin/views/sort/Date.php | 2 +- .../Plugin/views/sort/GroupByNumeric.php | 2 +- .../views/Plugin/views/sort/MenuHierarchy.php | 2 +- lib/Drupal/views/Plugin/views/sort/Random.php | 2 +- .../Plugin/views/sort/SortPluginBase.php | 2 +- .../views/Plugin/views/style/DefaultStyle.php | 2 +- .../Plugin/views/style/DefaultSummary.php | 2 +- lib/Drupal/views/Plugin/views/style/Grid.php | 2 +- .../views/Plugin/views/style/HtmlList.php | 2 +- .../views/Plugin/views/style/JumpMenu.php | 2 +- .../Plugin/views/style/JumpMenuSummary.php | 2 +- lib/Drupal/views/Plugin/views/style/Rss.php | 2 +- lib/Drupal/views/Plugin/views/style/Table.php | 2 +- .../Plugin/views/style/UnformattedSummary.php | 2 +- .../views/Plugin/views/wizard/Comment.php | 2 +- lib/Drupal/views/Plugin/views/wizard/File.php | 2 +- lib/Drupal/views/Plugin/views/wizard/Node.php | 2 +- .../Plugin/views/wizard/NodeRevision.php | 2 +- .../Plugin/views/wizard/TaxonomyTerm.php | 2 +- .../views/Plugin/views/wizard/Users.php | 2 +- .../Plugin/views/wizard/WizardPluginBase.php | 2 +- lib/Drupal/views/Tests/ViewsSqlTest.php | 40 ++--- .../Plugin/views/argument/CategoryCid.php | 2 +- .../aggregator/Plugin/views/argument/Fid.php | 2 +- .../aggregator/Plugin/views/argument/Iid.php | 2 +- .../Plugin/views/field/Category.php | 2 +- .../Plugin/views/field/TitleLink.php | 2 +- .../aggregator/Plugin/views/field/Xss.php | 2 +- .../Plugin/views/filter/CategoryCid.php | 2 +- lib/Views/aggregator/Plugin/views/row/Rss.php | 2 +- .../Plugin/views/argument_default/Root.php | 2 +- .../comment/Plugin/views/argument/UserUid.php | 2 +- .../comment/Plugin/views/field/Comment.php | 2 +- .../comment/Plugin/views/field/Depth.php | 2 +- .../comment/Plugin/views/field/LInkDelete.php | 2 +- .../Plugin/views/field/LastTimestamp.php | 2 +- lib/Views/comment/Plugin/views/field/Link.php | 2 +- .../Plugin/views/field/LinkApprove.php | 2 +- .../comment/Plugin/views/field/LinkEdit.php | 2 +- .../comment/Plugin/views/field/LinkReply.php | 2 +- .../Plugin/views/field/NcsLastCommentName.php | 2 +- .../Plugin/views/field/NcsLastUpdated.php | 2 +- .../Plugin/views/field/NodeComment.php | 2 +- .../comment/Plugin/views/field/NodeLink.php | 2 +- .../Plugin/views/field/NodeNewComments.php | 2 +- .../comment/Plugin/views/field/Username.php | 2 +- .../Plugin/views/filter/NcsLastUpdated.php | 2 +- .../Plugin/views/filter/NodeComment.php | 2 +- .../comment/Plugin/views/filter/UserUid.php | 2 +- lib/Views/comment/Plugin/views/row/Rss.php | 2 +- lib/Views/comment/Plugin/views/row/View.php | 2 +- .../Plugin/views/sort/NcsLastCommentName.php | 2 +- .../Plugin/views/sort/NcsLastUpdated.php | 2 +- .../comment/Plugin/views/sort/Thread.php | 2 +- .../Plugin/views/field/ContactLink.php | 2 +- .../field/Plugin/views/argument/FieldList.php | 2 +- .../Plugin/views/argument/ListString.php | 2 +- lib/Views/field/Plugin/views/field/Field.php | 2 +- .../field/Plugin/views/filter/FieldList.php | 2 +- .../views/relationship/EntityReverse.php | 2 +- lib/Views/file/Plugin/views/argument/Fid.php | 2 +- .../file/Plugin/views/field/Extension.php | 2 +- lib/Views/file/Plugin/views/field/File.php | 2 +- .../file/Plugin/views/field/FileMime.php | 2 +- lib/Views/file/Plugin/views/field/Status.php | 2 +- lib/Views/file/Plugin/views/field/Uri.php | 2 +- lib/Views/file/Plugin/views/filter/Status.php | 2 +- .../filter/Plugin/views/field/FormatName.php | 2 +- .../locale/Plugin/views/argument/Group.php | 2 +- .../locale/Plugin/views/argument/Language.php | 2 +- lib/Views/locale/Plugin/views/field/Group.php | 2 +- .../locale/Plugin/views/field/Language.php | 2 +- .../locale/Plugin/views/field/LinkEdit.php | 2 +- .../Plugin/views/field/NodeLanguage.php | 2 +- .../locale/Plugin/views/filter/Group.php | 2 +- .../locale/Plugin/views/filter/Language.php | 2 +- .../Plugin/views/filter/NodeLanguage.php | 2 +- .../locale/Plugin/views/filter/Version.php | 2 +- .../node/Plugin/views/argument/CreatedDay.php | 2 +- .../Plugin/views/argument/CreatedFullDate.php | 2 +- .../Plugin/views/argument/CreatedMonth.php | 2 +- .../Plugin/views/argument/CreatedWeek.php | 2 +- .../Plugin/views/argument/CreatedYear.php | 2 +- .../views/argument/CreatedYearMonth.php | 2 +- .../node/Plugin/views/argument/Language.php | 2 +- lib/Views/node/Plugin/views/argument/Nid.php | 2 +- lib/Views/node/Plugin/views/argument/Type.php | 2 +- .../Plugin/views/argument/UidRevision.php | 2 +- lib/Views/node/Plugin/views/argument/Vid.php | 2 +- .../Plugin/views/argument_default/Node.php | 2 +- .../Plugin/views/argument_validator/Node.php | 2 +- .../views/field/HistoryUserTimestamp.php | 2 +- lib/Views/node/Plugin/views/field/Link.php | 2 +- .../node/Plugin/views/field/LinkDelete.php | 2 +- .../node/Plugin/views/field/LinkEdit.php | 2 +- lib/Views/node/Plugin/views/field/Node.php | 2 +- lib/Views/node/Plugin/views/field/Path.php | 2 +- .../node/Plugin/views/field/Revision.php | 2 +- .../node/Plugin/views/field/RevisionLink.php | 2 +- .../Plugin/views/field/RevisionLinkDelete.php | 2 +- .../Plugin/views/field/RevisionLinkRevert.php | 2 +- lib/Views/node/Plugin/views/field/Type.php | 2 +- lib/Views/node/Plugin/views/filter/Access.php | 2 +- .../views/filter/HistoryUserTimestamp.php | 2 +- lib/Views/node/Plugin/views/filter/Status.php | 2 +- lib/Views/node/Plugin/views/filter/Type.php | 2 +- .../node/Plugin/views/filter/UidRevision.php | 2 +- lib/Views/node/Plugin/views/row/Rss.php | 2 +- lib/Views/node/Plugin/views/row/View.php | 2 +- .../search/Plugin/views/argument/Search.php | 2 +- lib/Views/search/Plugin/views/field/Score.php | 2 +- .../search/Plugin/views/filter/Search.php | 2 +- lib/Views/search/Plugin/views/row/View.php | 2 +- lib/Views/search/Plugin/views/sort/Score.php | 2 +- .../Plugin/views/field/AccesslogPath.php | 2 +- lib/Views/system/Plugin/views/filter/Type.php | 2 +- .../Plugin/views/argument/IndexTid.php | 2 +- .../Plugin/views/argument/IndexTidDepth.php | 2 +- .../views/argument/IndexTidDepthModifier.php | 2 +- .../Plugin/views/argument/Taxonomy.php | 2 +- .../views/argument/VocabularyMachineName.php | 2 +- .../Plugin/views/argument/VocabularyVid.php | 2 +- .../Plugin/views/argument_default/Tid.php | 2 +- .../Plugin/views/argument_validate/Term.php | 2 +- .../taxonomy/Plugin/views/field/LinkEdit.php | 2 +- .../taxonomy/Plugin/views/field/Taxonomy.php | 2 +- .../Plugin/views/field/TaxonomyIndexTid.php | 2 +- .../Plugin/views/filter/TaxonomyIndexTid.php | 2 +- .../views/filter/TaxonomyIndexTidDepth.php | 2 +- .../views/filter/VocabularyMachineName.php | 2 +- .../Plugin/views/filter/VocabularyVid.php | 2 +- .../views/relationship/NodeTermData.php | 2 +- .../Plugin/views/argument/NodeTnid.php | 2 +- .../Plugin/views/field/NodeLinkTranslate.php | 2 +- .../views/field/NodeTranslationLink.php | 2 +- .../Plugin/views/filter/NodeTnid.php | 2 +- .../Plugin/views/filter/NodeTnidChild.php | 2 +- .../Plugin/views/relationship/Translation.php | 2 +- .../user/Plugin/views/argument/RolesRid.php | 2 +- lib/Views/user/Plugin/views/argument/Uid.php | 2 +- .../views/argument_default/CurrentUser.php | 2 +- .../Plugin/views/argument_default/User.php | 2 +- .../Plugin/views/argument_validator/User.php | 2 +- .../user/Plugin/views/field/Language.php | 2 +- lib/Views/user/Plugin/views/field/Link.php | 2 +- .../user/Plugin/views/field/LinkCancel.php | 2 +- .../user/Plugin/views/field/LinkEdit.php | 2 +- lib/Views/user/Plugin/views/field/Mail.php | 2 +- lib/Views/user/Plugin/views/field/Name.php | 2 +- .../user/Plugin/views/field/Permissions.php | 2 +- lib/Views/user/Plugin/views/field/Picture.php | 2 +- lib/Views/user/Plugin/views/field/Roles.php | 2 +- lib/Views/user/Plugin/views/field/User.php | 2 +- .../user/Plugin/views/filter/Current.php | 2 +- lib/Views/user/Plugin/views/filter/Name.php | 2 +- .../user/Plugin/views/filter/Permissions.php | 2 +- lib/Views/user/Plugin/views/filter/Roles.php | 2 +- lib/Views/user/Plugin/views/row/View.php | 2 +- modules/aggregator.views.inc | 104 +++++------ modules/book.views.inc | 18 +- modules/comment.views.inc | 170 +++++++++--------- modules/contact.views.inc | 2 +- modules/field.views.inc | 22 +-- modules/file.views.inc | 4 +- modules/image.views.inc | 4 +- modules/language.views.inc | 32 ++-- modules/locale.views.inc | 60 +++---- modules/node.views.inc | 140 +++++++-------- modules/poll.views.inc | 6 +- modules/search.views.inc | 16 +- modules/statistics.views.inc | 76 ++++---- modules/system.views.inc | 122 ++++++------- modules/taxonomy.views.inc | 86 ++++----- modules/translation.views.inc | 24 +-- modules/user.views.inc | 122 ++++++------- modules/views.views.inc | 22 +-- .../Plugin/views/access/DynamicTest.php | 2 +- .../Plugin/views/access/StaticTest.php | 2 +- .../views/localization/LocalizationTest.php | 2 +- views.api.php | 30 ++-- views.module | 22 +-- 262 files changed, 815 insertions(+), 815 deletions(-) diff --git a/help/api-example.html b/help/api-example.html index 55cace3f4e89..654fbffcdc33 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 cf2343d5bc36..0cace87ecfa6 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 0574a3791905..19117309930d 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 0c83e34391db..e68d5e584eac 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 434758f0c697..7a97616080c9 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 d4723e3a1560..44b7fb495df8 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 2dccd35e62e3..05d8ad1da98c 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 37a36ad3fe49..87f4376cd62e 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 e0104349efde..a21c2968eeba 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 be22ec965d7b..6636b039d1da 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 137edca96399..fe5bc24676a1 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 5b281985f215..5834b3455661 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 de49c993c7cf..bb3e1908be62 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 2e9e790948cf..7432df0f1c57 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 286fb0277fd1..7ffc83456ba0 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 5189b9a44f24..333fc8e163f7 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 7a4681f0626f..9f47b8c00ff8 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 bdbdd35ccd66..61c8b919973d 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 37c3095e8886..cda7cbdded13 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 6b3450d92a9c..e8449b209647 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 78c84c92782c..2444cfd9bfd4 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 0c150dbfa7b7..69bc15c90508 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 4796bb5b28c7..b9979d96b245 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 704e02f20368..da988db1dac0 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 e8c70b4b13e8..209ed34a9d3b 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 fc17f1f8ccae..c5c7cd7ab548 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 40e9e6772e1a..7586f7ca5272 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 e11b5766e884..f78f77d8f2f5 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 9920b195ec23..471eaae342b1 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 1c071e038fe3..2e52a5d107a3 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 abb47151efaa..70d1ce23c784 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 463922e66db5..db01b417e488 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 2deb5cc1f851..be1512841be6 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 e8d2a38f7164..6bfd130e05ab 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 fcc8c342927a..16557b1ceab7 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 5c74d1142bbb..a33354a6dcbe 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 87d0848be85f..b5c8bdae376b 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 7235705c9f02..831042fc0a5f 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 96ec7d5628bc..fe2de176b8ef 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 f554bf17be0a..37f135c2c22f 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 f25ddd7608f7..c8d964909aab 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 1edefb666bea..e7bfd4c29cbb 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 53329f8a888b..838421508909 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 8cbaefeaca70..7d5e2f78d502 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 333f0f13b2ff..f12a16ba9853 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 da86d5b0442f..f847fd04de40 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 14244922c0b7..79bab19fc066 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 a35bf8676a75..ca3ca839a477 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 d18b625466b4..003eb92c9968 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 dc1c40ab651e..684b9b195e75 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 69ca4f4c478f..b769f94f215c 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 11193ca7bb8d..061efce970e0 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 83a09224c998..4d2487401ed9 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 f0d8698e8ebb..886c559632eb 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 d492dfb71845..9e3bd6f62efd 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 896a90e9d1da..316cd8dbdf49 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 a69d0e72907c..8b74532a89ab 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 29f7d40353a4..5838e449f135 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 ff38ea38d149..a9bf22cbd10d 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 8b56c7b88fe9..d5fe0890ca5a 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 81843892ad41..ddc3ad06c44c 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 9344519bae77..b21a39e538fd 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 de2c4803d60b..47b686ae45dc 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 1f486d6f09f6..bdd84bb374e9 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 c3e8d316b5cd..cef4c9c9c7cc 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 077fc0fa8c11..531e303261bd 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 1ddcea24843c..427c677a231c 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 8c2ff03e6116..3ce7479ef125 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 080a6c153a75..58f929fef481 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 2c04b23a2710..300ab4f94a5a 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 cf7f888398b4..0f58093b06f4 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 180d03127da2..b68ba1adcb49 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 f4fa24c95e7d..999407176798 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 8aabd3417880..61de7d48bd30 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 cdc4423b919b..1a83d0a8f973 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 eb9f23f2bdd0..8102d10ee83c 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 c883a3aa762a..03876ad38a62 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 4be407a96ea1..2b72b4ac7afa 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 ca968ea93730..b0b8d78aa8d9 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 437c6186c160..d9e4129734c9 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 3ffbb3bfacbd..67723300ec4c 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 a1b27eb46a69..f972030de5af 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 40997b327fa1..50b1f40e8f4c 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 a9b0b0b929fa..3c196ac2ea1e 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 3cd8b1495370..a8a818b0c096 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 fec0ec1aea34..42ae291ee196 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 73755ae80a7d..f21a78bbdda3 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 63ed0d17420a..1830cbc2ae97 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 aa633c58ab98..e68049744b4b 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 a0a726ba02a4..9c15f6578ead 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 872857c54394..d26690f3e135 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 e3a4bf185102..4b5ddf408f9a 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 78406c44ecfd..22da6289bda4 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 95f7d418fabf..29b6b9c320d2 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 b82d5443b50e..c96dc3fd3822 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 9d67a1aab902..2861b19b84ab 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 12e878187886..c26a4a36c433 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 8ba1886d0728..2a75a07558c2 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 b3e2bbc7c63b..a01a9c46cc3d 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 59392ead4ff1..295c1877f3ef 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 317dc607c5d5..e103290a0cee 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 9bbe4971833b..af3091f479d9 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 d2a0ac06fd3d..d2a0f962c8e1 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 745a881925cd..85cdcecf770f 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 ede221153908..7cfbd9b1254f 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 5a311929d8ae..576e4b51e5d0 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 eff1875e28a4..b181ba37e5f3 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 35e53f0d2635..d90b80e3e8e2 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 5680ba1ce5b7..358b70a4ecbc 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 dec3a576bd9d..5de4e4de7793 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 15286d666d20..7dbc2181fe8a 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 b4213e1560e5..6669fa9e5826 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 543cfb613a1a..c621aaa41f97 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 9f1ee99aed9c..bcc8c4d3d15c 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 9fc6bab20cc4..60f930cca1ac 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 eb051ddee9ce..6f95720105b3 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 69da9dcd6111..de6b67a02ca9 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 042c3993fbc2..75deb9e9fce0 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 44b41256b485..b1a35614f996 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 cca0d62d0d45..305cabe81c70 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 70b3d6fedc84..541d0dc4b796 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 2d2c1071ee73..e4ff778ebabb 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 b7de1f71a085..8db994879ebc 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 6fb42b17daea..5e9772d8f9aa 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 b97001470152..3105c70ea3b7 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 5b63b2edfdae..0dee2203c7c1 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 0bd43e1f7e7c..e99529d20d00 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 d4efb39cfea4..a3dc9319337e 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 5cf22ef0f581..3334edf2ef06 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 05c54ee0d6cd..ee89746fc5e5 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 2bc90ff7ef10..4e81127e8420 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 856fc119b7e2..066188b3c507 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 e5b6d9fe5ee7..9d5cc8158e1b 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 bf850dd01b0a..a46798e15cb9 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 6bdf70855aea..8b8e77315490 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 eedd30076829..a49abdb622f7 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 7083e8a25538..efd1377ddf9f 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 c4a4a772b434..d629644f62e5 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 45dc678ba954..e54728693df6 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 9285d3b75883..523775efe766 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 b44bedf8ecf6..6f5065e8f38a 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 3adf451a926f..8bbca51dbda0 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 88849876d612..1b2a9150bdd5 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 b61b78dd5833..58de8b5eddd8 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 3dd61a8296cd..e503c6746e34 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 3ff9ba0d3751..9ab4e7f5dbab 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 4e8c16b21500..a1862a4ef378 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 425b7fb2b6c2..d9de88ae1678 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 d77f4f1bbd5d..0c65ddb212c7 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 d257152da5b5..6cd1ac17ec43 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 b6c979f03a85..808d5ec7838a 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 420e630b5f79..710b8ff0cb5d 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 1ad05341b87b..c952d200a27a 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 da75127e5796..5ca8145e4b4f 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 7e75622e3a00..b23fee8af9f1 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 10a06e7ba8c6..943c4f8821cb 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 7f01044790f5..72954187661c 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 1e7944215f1d..075c23cd127f 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 8ba99dfc048a..396b50ea1a02 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 c19617985002..d321dad66ba0 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 50daefe40fd5..712dd356fb5d 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 b9c3cfea8730..f4efee4fc689 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 d71bc92f9cb0..e9f337e0a799 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 75e44ab7e6c4..cd1a294eba22 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 ce28b7856eed..b4ff62a86551 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 8637eff79a4e..2ac222ead012 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 299c0ca6786c..ed329b469128 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 b1f686aaa9e4..fd8256e5432e 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 6eacec2e4536..56b6525ca975 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 0e096ddbff20..8b7717a57d0e 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 034a4ee2aab0..1868697d4183 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 23cc7d8c0674..bf3543f19a6f 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 b2e138ae37d9..8f7cdb1ae02f 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 f4e8f61ea492..bb7ebc6041fb 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 ba7a00f9cfe1..433d6bb78d75 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 f5c828504016..279dfc12e19b 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 7f139343af67..e41c5248f3e4 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 709088781683..c98b33734c84 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 116db1b1dc84..01161d9247f4 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 a1e216bb0465..032d8e294113 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 51e5d6f714be..6441c5d7cbd6 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 99f676858e36..d2fce3aa78cb 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 4f6e3439cc6c..68bb561fea2c 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 c90bc655de11..e718283e5c29 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 f9e8b27e32f0..df39c4041c3a 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 3c38f702ed7c..b66d6f7e911a 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 5577f2321a4b..326e1abe1593 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 a2461e68ce3d..11b233e60996 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 90edf9547cc3..4a2a0b6041c6 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 2d66f558fa83..f035a643484f 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 b1059db6137c..067772452575 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 f21c33cb172e..2663be4d0741 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 10835d8b5a62..c159053e75f3 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 4935b7ba69d5..d5818e2412bd 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 6174b50a0c0b..bb9b12c76fde 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 27f967319270..2ace184bef3e 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 f2b2e75b3b13..e63ed13f97dd 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 e6ffe15771fd..5d1e8fd878b9 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 c618711253bf..89028b9e8a0a 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 32f8c250f6e4..aaac24189e93 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 6a11d92d7cff..0666d195c715 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 e4d86e4fce9a..047c40ba2d90 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 cd57f5be4c82..07d2589c9d45 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 8ca1bc3cfe83..1707eb3d8855 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 7b7e8e022667..cf1aff54235a 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 8e5e4d45476b..b114948923f1 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 7886dd1fb87f..bbd9423e695a 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 4f6942135930..b24acf153aa5 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 fa810e1e8462..feaceb500c69 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 ef7f25ebe486..2ef9381e005c 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 8215aef75bd5..02d9db176db2 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 e45f162dffc2..379ce37b308e 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 7b9ada237132..b62a5cc2996c 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 b6eb42895b9a..286dbeac6b8f 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 0a3e5e7af8d3..dc4187bec28e 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 9ccc74bada12..55f58055c023 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 6a980fbcc104..6497d4405ac5 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 1f89cca912fe..05cd5e9c1f00 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 f36d14d7e930..847907b32891 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 18bc5d4e8b6e..ba15913a8309 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 1e683a40db29..4f33c67823b3 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 52ae8b3a47a5..933c9f9fa3bb 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 e38bd264b63a..e5a6c00cbbfd 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 da295fb538ee..da2c3429c06b 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 146800a36f1e..8dfd06ffdffb 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 4ee20a8f4e8f..b0ab040d6274 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 96ee4f191f95..4dff2695d681 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 540a6029b097..0003d01cd18e 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 eb7704eed607..3cd28fadfe1a 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 ce2cda7e88d6..c77f3525c616 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 5edde3e6cb05..3f4b0dbd9fd1 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 b12e4aca21da..58a7d2d46e84 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 f27182f3c8f9..58e1e7762726 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 068569dc5188..9b236d6c56c5 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 e266ed07a801..ef1258cc34b8 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 5bf3ded5e00e..2859c885dee6 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 157b4c709851..aac996d5dcd5 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 7488179d0003..42b14b8dd797 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 8d80d5d934d5..26a77cd4cbe6 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 c28949abd135..7ad339424db7 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 dc48c8d1649c..731a4959517a 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 f747db865837..53146f714eb6 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 b7e1b7232e67..307ffbc176d1 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 bc407681f35a..eb8d193a6b80 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 df8bebe80389..f13025951211 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 09c6b3772d98..43c04d69ac0f 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 d47b64fcddd0..17801913f2fe 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 b4246fe99d89..cdbb32bc9e47 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 0a12ca1f0e41..101a21ecaf02 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 8910b7f22dd8..718ff289b2b5 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 b3ae5da4865b..03edc4b126f5 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 af0b707b3db3..4bd0253f050f 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 fffd0857afa7..a431df8a4981 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 4232fcdf22b3..7134e94717cd 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 c55e513e70e2..7f28fa50c8ad 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 d236dc440892..38b2fcb04a15 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 64e2209e1101..c8f94c23ad4b 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 1d1a01cefe58..877d0fd50abf 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 b12f015dee70..4c89a6d7f2e5 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 fe3138e94da7..dfbf37252b7d 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 cce8444e02cd..14c258bc5169 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 836e6c6483f2..056ad2133c7c 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); } -- GitLab