1,13d0 < diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php < index 9df7f10..3424ca7 100644 < --- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php < +++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php < @@ -28,7 +28,7 @@ class Category extends FieldPluginBase { < public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) { < parent::init($view, $display, $options); < < - $this->additional_fields['cid'] = 'cid'; < + $this->additionalFields['cid'] = 'cid'; < } < < /** 15c2 < index dbcf781..0eaba40 100644 --- > index 27b5aa0..df1ebe7 100644 28c15 < index 45e47c4..916fe0f 100644 --- > index 6ca9540..cde9cd7 100644 31c18 < @@ -31,8 +31,8 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o --- > @@ -38,9 +38,9 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o 36c23,24 < - $this->additional_fields['nid'] = 'nid'; --- > - $this->additional_fields['entity_id'] = 'entity_id'; > - $this->additional_fields['entity_type'] = 'entity_type'; 38c26,27 < + $this->additionalFields['nid'] = 'nid'; --- > + $this->additionalFields['entity_id'] = 'entity_id'; > + $this->additionalFields['entity_type'] = 'entity_type'; 43c32 < index ee2772b..a2d9445 100644 --- > index 5ba79da..aa3bbb1 100644 46c35 < @@ -27,7 +27,7 @@ class LastTimestamp extends Date { --- > @@ -28,7 +28,7 @@ class LastTimestamp extends Date { 54,80c43 < public function render($values) { < diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php < index 6be3577..49b40c1 100644 < --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php < +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php < @@ -42,7 +42,7 @@ public function query() { < // ncs_user alias so this can work with the sort handler, below. < $this->user_table = $this->query->ensureTable('ncs_users', $this->relationship, $join); < < - $this->field_alias = $this->query->addField(NULL, "COALESCE($this->user_table.name, $this->tableAlias.$this->field)", $this->tableAlias . '_' . $this->field); < + $this->fieldAlias = $this->query->addField(NULL, "COALESCE($this->user_table.name, $this->tableAlias.$this->field)", $this->tableAlias . '_' . $this->field); < < $this->user_field = $this->query->addField($this->user_table, 'name'); < $this->uid = $this->query->addField($this->tableAlias, 'last_comment_uid'); < diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php < index f6209f2..3828cd2 100644 < --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php < +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php < @@ -22,7 +22,7 @@ class NcsLastUpdated extends Date { < public function query() { < $this->ensureMyTable(); < $this->node_table = $this->query->ensureTable('node', $this->relationship); < - $this->field_alias = $this->query->addField(NULL, "GREATEST(" . $this->node_table . ".changed, " . $this->tableAlias . ".last_comment_timestamp)", $this->tableAlias . '_' . $this->field); < + $this->fieldAlias = $this->query->addField(NULL, "GREATEST(" . $this->node_table . ".changed, " . $this->tableAlias . ".last_comment_timestamp)", $this->tableAlias . '_' . $this->field); < } < < } --- > /** 82c45 < index 9041a55..966ae10 100644 --- > index 270136e..5f92fdc 100644 85c48 < @@ -62,9 +62,9 @@ public static function create(ContainerInterface $container, array $configuratio --- > @@ -70,9 +70,9 @@ public static function create(ContainerInterface $container, array $configuratio 89c52 < - $this->additional_fields['nid'] = 'nid'; --- > - $this->additional_fields['entity_id'] = 'nid'; 91,92c54,55 < - $this->additional_fields['comment_count'] = array('table' => 'node_comment_statistics', 'field' => 'comment_count'); < + $this->additionalFields['nid'] = 'nid'; --- > - $this->additional_fields['comment_count'] = array('table' => 'comment_entity_statistics', 'field' => 'comment_count'); > + $this->additionalFields['entity_id'] = 'nid'; 94c57 < + $this->additionalFields['comment_count'] = array('table' => 'node_comment_statistics', 'field' => 'comment_count'); --- > + $this->additionalFields['comment_count'] = array('table' => 'comment_entity_statistics', 'field' => 'comment_count'); 98c61 < @@ -89,7 +89,7 @@ public function buildOptionsForm(&$form, &$form_state) { --- > @@ -97,7 +97,7 @@ public function buildOptionsForm(&$form, &$form_state) { 107c70 < @@ -102,7 +102,7 @@ public function preRender(&$values) { --- > @@ -110,7 +110,7 @@ public function preRender(&$values) { 116,117c79,80 < @@ -122,7 +122,7 @@ public function preRender(&$values) { < --- > @@ -129,7 +129,7 @@ public function preRender(&$values) { > )); 126c89 < index 4bad129..ba1c250 100644 --- > index 9d63403..decb9e0 100644 141c104 < index 7ce432b..906c8f2 100644 --- > index 9bbb6ca..fd7277a 100644 144c107 < @@ -185,7 +185,7 @@ public function query($use_groupby = FALSE) { --- > @@ -215,7 +215,7 @@ public function query($use_groupby = FALSE) { 154c117 < index c1d2493..446bc3d 100644 --- > index 3f28bd8..dfda5a1 100644 167c130 < index 8fa60d5..704a2ac 100644 --- > index 8c6ab7e..8c56d39 100644 170,173c133,136 < @@ -34,7 +34,7 @@ public function buildOptionsForm(&$form, &$form_state) { < } < < public function render($values) { --- > @@ -38,7 +38,7 @@ public function buildOptionsForm(&$form, &$form_state) { > * {@inheritdoc} > */ > public function render(ResultRow $values) { 180c143 < index b568b0d..f435456 100644 --- > index 1191265..d334779 100644 183,186c146,149 < @@ -33,7 +33,7 @@ public function buildOptionsForm(&$form, &$form_state) { < } < < public function render($values) { --- > @@ -37,7 +37,7 @@ public function buildOptionsForm(&$form, &$form_state) { > * {@inheritdoc} > */ > public function render(ResultRow $values) { 193c156 < index ab81c8e..a649b7b 100644 --- > index 2efd1cb..75b8952 100644 196c159,160 < @@ -32,10 +32,10 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o --- > @@ -39,10 +39,10 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o > parent::init($view, $display, $options); 198,199c162 < global $user; < if ($user->isAuthenticated()) { --- > if (\Drupal::currentUser()->isAuthenticated()) { 205,206c168,169 < - $this->additional_fields['last_comment'] = array('table' => 'node_comment_statistics', 'field' => 'last_comment_timestamp'); < + $this->additionalFields['last_comment'] = array('table' => 'node_comment_statistics', 'field' => 'last_comment_timestamp'); --- > - $this->additional_fields['last_comment'] = array('table' => 'comment_entity_statistics', 'field' => 'last_comment_timestamp'); > + $this->additionalFields['last_comment'] = array('table' => 'comment_entity_statistics', 'field' => 'last_comment_timestamp'); 211c174 < index 9419999..e2b4ea8 100644 --- > index b2de15a..c2ef072 100644 214c177 < @@ -32,9 +32,9 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o --- > @@ -32,7 +32,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o 220,223d182 < if (module_exists('translation')) { < - $this->additional_fields['langcode'] = array('table' => 'node', 'field' => 'langcode'); < + $this->additionalFields['langcode'] = array('table' => 'node', 'field' => 'langcode'); < } 226,227c185,187 < @@ -65,7 +65,7 @@ public function buildOptionsForm(&$form, &$form_state) { < * Data should be made XSS safe prior to calling this function. --- > > @@ -68,7 +68,7 @@ public function buildOptionsForm(&$form, &$form_state) { > * Returns a string for the link text. 229c189 < function render_link($data, ResultRow $values) { --- > protected function renderLink($data, ResultRow $values) { 236c196 < index 78ff114..c68a375 100644 --- > index 4c0c6c8..d72399e 100644 239c199 < @@ -27,7 +27,7 @@ class Path extends FieldPluginBase { --- > @@ -28,7 +28,7 @@ class Path extends FieldPluginBase { 249c209 < index d1a574a..5d998f6 100644 --- > index f99f6b7..6ad8e44 100644 252c212 < @@ -29,10 +29,10 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o --- > @@ -29,8 +29,8 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o 260,263d219 < if (module_exists('translation')) { < - $this->additional_fields['langcode'] = array('table' => 'node', 'field' => 'langcode'); < + $this->additionalFields['langcode'] = array('table' => 'node', 'field' => 'langcode'); < } 265a222 > protected function defineOptions() { 267c224 < index 8076861..c90de92 100644 --- > index 6a733f3..c7f4dcd 100644 274,275c231,232 < - $this->additional_fields['node_vid'] = array('table' => 'node_field_revision', 'field' => 'vid'); < + $this->additionalFields['node_vid'] = array('table' => 'node_field_revision', 'field' => 'vid'); --- > - $this->additional_fields['node_vid'] = array('table' => 'node_revision', 'field' => 'vid'); > + $this->additionalFields['node_vid'] = array('table' => 'node_revision', 'field' => 'vid'); 280c237 < index 9293694..a4fed60 100644 --- > index e6646d1..4d035d9 100644 283c240 < @@ -63,7 +63,7 @@ public function query() { --- > @@ -64,7 +64,7 @@ public function query() { 293c250 < index 00d6c71..a15aa65 100644 --- > index 54b5ad5..f3bd6e8 100644 296c253 < @@ -27,8 +27,8 @@ class LinkEdit extends FieldPluginBase { --- > @@ -28,8 +28,8 @@ class LinkEdit extends FieldPluginBase { 308c265 < index bcf2127..b0e4c2b 100644 --- > index be01032..1200925 100644 311c268 < @@ -34,8 +34,8 @@ class Taxonomy extends FieldPluginBase { --- > @@ -35,8 +35,8 @@ class Taxonomy extends FieldPluginBase { 349c306 < index 1a0d89e..6702057 100644 --- > index 88102b8..f25a6c5 100644 352c309 < @@ -29,7 +29,7 @@ class Link extends FieldPluginBase { --- > @@ -36,7 +36,7 @@ public function usesGroupBy() { 362c319 < index f754edc..9dca752 100644 --- > index fb374ba..69be5a3 100644 375c332 < index d4f0c79..ae09978 100644 --- > index 2c0529b..3a46435 100644 413c370 < index 60fdf91..3e43565 100644 --- > index 159b4aa..56388d6 100644 426c383 < index 7ecf18e..42f34ca 100644 --- > index bc37f33..f585a17 100644 429c386 < @@ -70,7 +70,7 @@ public static function create(ContainerInterface $container, array $configuratio --- > @@ -71,7 +71,7 @@ public static function create(ContainerInterface $container, array $configuratio 439c396 < index 30f7167..3306ec8 100644 --- > index db4a5d8..6038587 100644 442,444c399,401 < @@ -51,22 +51,35 @@ < */ < abstract class FieldPluginBase extends HandlerBase { --- > @@ -51,22 +51,34 @@ > */ > const RENDER_TEXT_PHASE_EMPTY = 2; 468c425 < + protected $originalValue = NULL; --- > + public $originalValue = NULL; 471c428 < - * @var array --- > * @var array 473,474c430,431 < + * The additional fields which get added to the query. < + * --- > + * Stores additional fields which get added to the query. > + * 476,477d432 < + * < + * @var array 480c435 < + protected $additionalFields = array(); --- > + var $additionalFields = array(); 484c439 < @@ -74,9 +87,9 @@ --- > @@ -74,9 +86,9 @@ 496c451 < @@ -101,7 +114,7 @@ public function query() { --- > @@ -101,7 +113,7 @@ public function query() { 505c460 < @@ -119,10 +132,10 @@ public function query() { --- > @@ -119,10 +131,10 @@ public function query() { 518c473 < @@ -167,11 +180,11 @@ protected function addAdditionalFields($fields = NULL) { --- > @@ -167,11 +179,11 @@ protected function addAdditionalFields($fields = NULL) { 532c487 < @@ -390,7 +403,7 @@ public function getEntity(ResultRow $values) { --- > @@ -390,7 +402,7 @@ public function getEntity(ResultRow $values) { 535c490 < public function getValue($values, $field = NULL) { --- > public function getValue(ResultRow $values, $field = NULL) { 541c496 < @@ -1114,7 +1127,7 @@ public function advancedRender($values) { --- > @@ -1119,7 +1131,7 @@ public function advancedRender(ResultRow $values) { 550c505 < @@ -1123,7 +1136,7 @@ public function advancedRender($values) { --- > @@ -1128,7 +1140,7 @@ public function advancedRender(ResultRow $values) { 559c514 < @@ -1136,7 +1149,7 @@ public function advancedRender($values) { --- > @@ -1141,7 +1153,7 @@ public function advancedRender(ResultRow $values) { 567,568c522,523 < $alter['phase'] = VIEWS_HANDLER_RENDER_TEXT_PHASE_SINGLE_ITEM; < @@ -1217,7 +1230,7 @@ public function renderText($alter) { --- > $alter['phase'] = static::RENDER_TEXT_PHASE_SINGLE_ITEM; > @@ -1222,7 +1234,7 @@ public function renderText($alter) { 578c533 < index f90b1a9..db2a9ea 100644 --- > index 7acd40b..9e6896c 100644 581,584c536,539 < @@ -67,7 +67,7 @@ public function preRender(&$values) { < } < < public function render($values) { --- > @@ -71,7 +71,7 @@ public function preRender(&$values) { > * {@inheritdoc} > */ > public function render(ResultRow $values) { 587c542 < if (!empty($this->options['machine_name']) || !isset($this->value_options[$value])) { --- > if (!empty($this->options['machine_name']) || !isset($this->valueOptions[$value])) { 591c546 < index 24c98c1..cb4dce9 100644 --- > index 8145321..fc0714f 100644 594c549 < @@ -34,9 +34,9 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o --- > @@ -35,9 +35,9 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o 607c562 < index 2aa8639..32ac700 100644 --- > index db67c57..fb10166 100644 610,613c565,568 < @@ -60,7 +60,7 @@ public function validateOptionsForm(&$form, &$form_state) { < } < < public function render($values) { --- > @@ -64,7 +64,7 @@ public function validateOptionsForm(&$form, &$form_state) { > * {@inheritdoc} > */ > public function render(ResultRow $values) { 620c575 < index a42de6f..a4f8a8f 100644 --- > index bbd1a96..5ab6947 100644 623,626c578,581 < @@ -38,7 +38,7 @@ public function buildOptionsForm(&$form, &$form_state) { < } < < public function render($values) { --- > @@ -42,7 +42,7 @@ public function buildOptionsForm(&$form, &$form_state) { > * {@inheritdoc} > */ > public function render(ResultRow $values) { 633c588 < index a274242..8e789c1 100644 --- > index 69d7beb..a117ba9 100644 646c601 < index d051c54..193f23c 100644 --- > index a9571d1..9d64486 100644