--- 2652000-106.patch	2020-05-01 11:31:43.098241240 +0300
+++ 2652000-9.1-111.patch	2020-05-01 11:46:07.876275079 +0300
@@ -1,5 +1,5 @@
 diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml
-index 4bb7e56..14672fe 100644
+index 4bb7e563a0..14672fe62e 100644
 --- a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml
 +++ b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml
 @@ -118,6 +118,7 @@ display:
@@ -11,7 +11,7 @@
            entity_type: aggregator_item
            entity_field: iid
 diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml
-index d7fbbf3..69381a8 100644
+index d7fbbf38f2..69381a8a92 100644
 --- a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml
 +++ b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml
 @@ -125,6 +125,7 @@ display:
@@ -55,7 +55,7 @@
            plugin_id: url
            entity_type: aggregator_feed
 diff --git a/core/modules/block_content/config/optional/views.view.block_content.yml b/core/modules/block_content/config/optional/views.view.block_content.yml
-index 3ba504b..0804257 100644
+index 3ba504b66a..0804257fa7 100644
 --- a/core/modules/block_content/config/optional/views.view.block_content.yml
 +++ b/core/modules/block_content/config/optional/views.view.block_content.yml
 @@ -159,6 +159,7 @@ display:
@@ -91,7 +91,7 @@
            entity_type: block_content
            plugin_id: entity_operations
 diff --git a/core/modules/comment/config/optional/views.view.comment.yml b/core/modules/comment/config/optional/views.view.comment.yml
-index 6a5151d..d836008 100644
+index 6a5151d8c7..d836008018 100644
 --- a/core/modules/comment/config/optional/views.view.comment.yml
 +++ b/core/modules/comment/config/optional/views.view.comment.yml
 @@ -176,6 +176,7 @@ display:
@@ -223,7 +223,7 @@
            type: user_name
            settings:
 diff --git a/core/modules/comment/config/optional/views.view.comments_recent.yml b/core/modules/comment/config/optional/views.view.comments_recent.yml
-index a8fe1f8..04a04df 100644
+index a8fe1f841c..04a04df81a 100644
 --- a/core/modules/comment/config/optional/views.view.comments_recent.yml
 +++ b/core/modules/comment/config/optional/views.view.comments_recent.yml
 @@ -108,6 +108,7 @@ display:
@@ -243,7 +243,7 @@
            settings:
              future_format: '@interval hence'
 diff --git a/core/modules/content_moderation/config/optional/views.view.moderated_content.yml b/core/modules/content_moderation/config/optional/views.view.moderated_content.yml
-index beedf9d..355679a 100644
+index beedf9d08b..355679af31 100644
 --- a/core/modules/content_moderation/config/optional/views.view.moderated_content.yml
 +++ b/core/modules/content_moderation/config/optional/views.view.moderated_content.yml
 @@ -173,6 +173,7 @@ display:
@@ -295,7 +295,7 @@
            entity_type: node
            plugin_id: entity_operations
 diff --git a/core/modules/dblog/config/optional/views.view.watchdog.yml b/core/modules/dblog/config/optional/views.view.watchdog.yml
-index 51066a7..02ad8ef 100644
+index 51066a7d85..02ad8efc44 100644
 --- a/core/modules/dblog/config/optional/views.view.watchdog.yml
 +++ b/core/modules/dblog/config/optional/views.view.watchdog.yml
 @@ -189,6 +189,7 @@ display:
@@ -363,7 +363,7 @@
        filters:
          type:
 diff --git a/core/modules/file/config/optional/views.view.files.yml b/core/modules/file/config/optional/views.view.files.yml
-index 25d2e42..418d261 100644
+index 25d2e42c6a..418d2615eb 100644
 --- a/core/modules/file/config/optional/views.view.files.yml
 +++ b/core/modules/file/config/optional/views.view.files.yml
 @@ -173,6 +173,7 @@ display:
@@ -463,7 +463,7 @@
            precision: 0
            decimal: .
 diff --git a/core/modules/media/config/optional/views.view.media.yml b/core/modules/media/config/optional/views.view.media.yml
-index 584b5f5..5b9089f 100644
+index 584b5f504c..5b9089f4eb 100644
 --- a/core/modules/media/config/optional/views.view.media.yml
 +++ b/core/modules/media/config/optional/views.view.media.yml
 @@ -181,6 +181,7 @@ display:
@@ -531,7 +531,7 @@
            entity_type: media
            plugin_id: entity_operations
 diff --git a/core/modules/media_library/config/install/views.view.media_library.yml b/core/modules/media_library/config/install/views.view.media_library.yml
-index 32fdbe4..bd4ad57 100644
+index 32fdbe4a3d..bd4ad5786d 100644
 --- a/core/modules/media_library/config/install/views.view.media_library.yml
 +++ b/core/modules/media_library/config/install/views.view.media_library.yml
 @@ -131,6 +131,7 @@ display:
@@ -647,7 +647,7 @@
          type: perm
          options:
 diff --git a/core/modules/node/config/optional/views.view.content.yml b/core/modules/node/config/optional/views.view.content.yml
-index 26ca0b7..3e436d7 100644
+index 26ca0b7afc..3e436d724b 100644
 --- a/core/modules/node/config/optional/views.view.content.yml
 +++ b/core/modules/node/config/optional/views.view.content.yml
 @@ -151,6 +151,7 @@ display:
@@ -707,7 +707,7 @@
            plugin_id: entity_operations
        filters:
 diff --git a/core/modules/node/config/optional/views.view.content_recent.yml b/core/modules/node/config/optional/views.view.content_recent.yml
-index 54ef192..927bd3a 100644
+index 54ef192695..927bd3a93f 100644
 --- a/core/modules/node/config/optional/views.view.content_recent.yml
 +++ b/core/modules/node/config/optional/views.view.content_recent.yml
 @@ -92,6 +92,7 @@ display:
@@ -727,7 +727,7 @@
            type: timestamp_ago
            settings: {  }
 diff --git a/core/modules/node/config/optional/views.view.glossary.yml b/core/modules/node/config/optional/views.view.glossary.yml
-index 81cd423..19569f3 100644
+index 81cd423d88..19569f3503 100644
 --- a/core/modules/node/config/optional/views.view.glossary.yml
 +++ b/core/modules/node/config/optional/views.view.glossary.yml
 @@ -114,6 +114,7 @@ display:
@@ -755,7 +755,7 @@
            entity_field: changed
        arguments:
 diff --git a/core/modules/user/config/optional/views.view.user_admin_people.yml b/core/modules/user/config/optional/views.view.user_admin_people.yml
-index 57704e9..9a53b55 100644
+index 57704e9bdc..9a53b55f26 100644
 --- a/core/modules/user/config/optional/views.view.user_admin_people.yml
 +++ b/core/modules/user/config/optional/views.view.user_admin_people.yml
 @@ -186,6 +186,7 @@ display:
@@ -823,7 +823,7 @@
            type: basic_string
            settings: {  }
 diff --git a/core/modules/user/config/optional/views.view.who_s_new.yml b/core/modules/user/config/optional/views.view.who_s_new.yml
-index a48b1b6..e9e481e 100644
+index a48b1b6670..e9e481efc0 100644
 --- a/core/modules/user/config/optional/views.view.who_s_new.yml
 +++ b/core/modules/user/config/optional/views.view.who_s_new.yml
 @@ -84,6 +84,7 @@ display:
@@ -835,7 +835,7 @@
            entity_field: name
        filters:
 diff --git a/core/modules/user/config/optional/views.view.who_s_online.yml b/core/modules/user/config/optional/views.view.who_s_online.yml
-index d4b5a89..6596dff 100644
+index d4b5a895df..6596dff935 100644
 --- a/core/modules/user/config/optional/views.view.who_s_online.yml
 +++ b/core/modules/user/config/optional/views.view.who_s_online.yml
 @@ -91,6 +91,7 @@ display:
@@ -847,7 +847,7 @@
            entity_field: name
        filters:
 diff --git a/core/modules/views/config/schema/views.data_types.schema.yml b/core/modules/views/config/schema/views.data_types.schema.yml
-index 708e12f..382e502 100644
+index 708e12f6d8..382e50274e 100644
 --- a/core/modules/views/config/schema/views.data_types.schema.yml
 +++ b/core/modules/views/config/schema/views.data_types.schema.yml
 @@ -571,6 +571,9 @@ views_field:
@@ -861,10 +861,10 @@
        type: string
        label: 'Plugin ID'
 diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
-index f8c300a..3d43d9b 100644
+index 2d22350150..c0e5d796ea 100644
 --- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
 +++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
-@@ -484,6 +484,8 @@ protected function defineOptions() {
+@@ -485,6 +485,8 @@ protected function defineOptions() {
      $options['empty_zero'] = ['default' => FALSE];
      $options['hide_alter_empty'] = ['default' => TRUE];
  
@@ -873,7 +873,7 @@
      return $options;
    }
  
-@@ -706,6 +708,14 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
+@@ -707,6 +709,14 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
        '#fieldset' => 'style_settings',
      ];
  
@@ -881,14 +881,14 @@
 +      '#type' => 'checkbox',
 +      '#title' => $this->t('Set the active class on links to the current page'),
 +      '#default_value' => $this->options['set_active_class'],
-+      '#description' => $this->t('If checked, if the field links to the current page, an "is-active" class will be added on active links.'),
++      '#description' => $this->t('If the field links to the current page, an "is-active" class will be added if this option is enabled.'),
 +      '#fieldset' => 'style_settings',
 +    ];
 +
      $form['alter'] = [
        '#title' => $this->t('Rewrite results'),
        '#type' => 'details',
-@@ -1163,7 +1173,13 @@ public function advancedRender(ResultRow $values) {
+@@ -1164,7 +1174,13 @@ public function advancedRender(ResultRow $values) {
      if ($this->allowAdvancedRender()) {
        if ($this instanceof MultiItemsFieldHandlerInterface) {
          $items = [];
@@ -902,7 +902,7 @@
            $value = $this->render_item($count, $item);
            if (is_array($value)) {
              $value = (string) $this->getRenderer()->render($value);
-@@ -1393,6 +1409,7 @@ protected function renderAsLink($alter, $text, $tokens) {
+@@ -1394,6 +1410,7 @@ protected function renderAsLink($alter, $text, $tokens) {
        'fragment' => NULL,
        'language' => NULL,
        'query' => [],
@@ -911,10 +911,10 @@
  
      $alter += [
 diff --git a/core/modules/views/src/ViewsConfigUpdater.php b/core/modules/views/src/ViewsConfigUpdater.php
-index af32604..7a7f14f 100644
+index 39007783e6..a48ad1b2cd 100644
 --- a/core/modules/views/src/ViewsConfigUpdater.php
 +++ b/core/modules/views/src/ViewsConfigUpdater.php
-@@ -113,6 +113,9 @@ public function updateAll(ViewEntityInterface $view) {
+@@ -137,6 +137,9 @@ public function updateAll(ViewEntityInterface $view) {
        if ($this->processMultivalueBaseFieldHandler($handler, $handler_type, $key, $display_id, $view)) {
          $changed = TRUE;
        }
@@ -924,11 +924,12 @@
        return $changed;
      });
    }
-@@ -273,6 +276,21 @@ public function needsMultivalueBaseFieldUpdate(ViewEntityInterface $view) {
+@@ -330,6 +333,21 @@ public function needsMultivalueBaseFieldUpdate(ViewEntityInterface $view) {
+     return FALSE;
    }
  
-   /**
-+   * Sets default value for field set active class option.
++  /**
++   * Sets default value for field set_active_class_option.
 +   *
 +   * @param \Drupal\views\ViewEntityInterface $view
 +   *   The View to update.
@@ -942,15 +943,15 @@
 +    });
 +  }
 +
-+  /**
+   /**
     * Returns the multivalue base fields update table info.
     *
-    * @return array
-@@ -391,6 +409,30 @@ protected function processMultivalueBaseFieldHandler(array &$handler, $handler_t
+@@ -454,6 +472,30 @@ protected function processMultivalueBaseFieldHandler(array &$handler, $handler_t
+     return $changed;
    }
  
-   /**
-+   * Processes field set active class defaults.
++  /**
++   * Processes field set_active_class defaults.
 +   *
 +   * @param array $handler
 +   *   A display handler.
@@ -973,13 +974,12 @@
 +    return $changed;
 +  }
 +
-+  /**
+   /**
     * Maps a single operator to a multiple one, if possible.
     *
-    * @param string $single_operator
 diff --git a/core/modules/views/tests/fixtures/update/set-active-class.php b/core/modules/views/tests/fixtures/update/set-active-class.php
 new file mode 100644
-index 0000000..0a7a1e2
+index 0000000000..0a7a1e2eaf
 --- /dev/null
 +++ b/core/modules/views/tests/fixtures/update/set-active-class.php
 @@ -0,0 +1,20 @@
@@ -1005,10 +1005,10 @@
 +  ->execute();
 diff --git a/core/modules/views/tests/fixtures/update/views.view.test_set_active_class.yml b/core/modules/views/tests/fixtures/update/views.view.test_set_active_class.yml
 new file mode 100644
-index 0000000..68da2ac
+index 0000000000..2a08508b76
 --- /dev/null
 +++ b/core/modules/views/tests/fixtures/update/views.view.test_set_active_class.yml
-@@ -0,0 +1,183 @@
+@@ -0,0 +1,167 @@
 +langcode: en
 +status: true
 +dependencies:
@@ -1016,7 +1016,7 @@
 +    - node
 +    - user
 +id: test_set_active_class
-+label: 'Test block set active class'
++label: 'Test set_active_class'
 +module: views
 +description: ''
 +tag: ''
@@ -1146,23 +1146,7 @@
 +            operator_limit_selection: false
 +            operator_list: {  }
 +          group: 1
-+      sorts:
-+        created:
-+          id: created
-+          table: node_field_data
-+          field: created
-+          order: DESC
-+          entity_type: node
-+          entity_field: created
-+          plugin_id: date
-+          relationship: none
-+          group_type: group
-+          admin_label: ''
-+          exposed: false
-+          expose:
-+            label: ''
-+          granularity: second
-+      title: 'Test block set active class'
++      title: 'Test set_active_class'
 +      header: {  }
 +      footer: {  }
 +      empty: {  }
@@ -1194,10 +1178,10 @@
 +      tags: {  }
 diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_set_active_class.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_set_active_class.yml
 new file mode 100644
-index 0000000..68da2ac
+index 0000000000..2a08508b76
 --- /dev/null
 +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_set_active_class.yml
-@@ -0,0 +1,183 @@
+@@ -0,0 +1,167 @@
 +langcode: en
 +status: true
 +dependencies:
@@ -1205,7 +1189,7 @@
 +    - node
 +    - user
 +id: test_set_active_class
-+label: 'Test block set active class'
++label: 'Test set_active_class'
 +module: views
 +description: ''
 +tag: ''
@@ -1335,23 +1319,7 @@
 +            operator_limit_selection: false
 +            operator_list: {  }
 +          group: 1
-+      sorts:
-+        created:
-+          id: created
-+          table: node_field_data
-+          field: created
-+          order: DESC
-+          entity_type: node
-+          entity_field: created
-+          plugin_id: date
-+          relationship: none
-+          group_type: group
-+          admin_label: ''
-+          exposed: false
-+          expose:
-+            label: ''
-+          granularity: second
-+      title: 'Test block set active class'
++      title: 'Test set_active_class'
 +      header: {  }
 +      footer: {  }
 +      empty: {  }
@@ -1383,7 +1351,7 @@
 +      tags: {  }
 diff --git a/core/modules/views/tests/src/Functional/Update/SetActiveClassTest.php b/core/modules/views/tests/src/Functional/Update/SetActiveClassTest.php
 new file mode 100644
-index 0000000..1afdf7b
+index 0000000000..96ffd091f0
 --- /dev/null
 +++ b/core/modules/views/tests/src/Functional/Update/SetActiveClassTest.php
 @@ -0,0 +1,50 @@
@@ -1418,7 +1386,7 @@
 +   * Tests the upgrade path for the set_active_class option.
 +   */
 +  public function testViewsPostUpdateSetActiveClass() {
-+    // Assert no fields in the test view have the set active class option set.
++    // Assert no fields in the test view have the set_active_class option set.
 +    $view = View::load('test_set_active_class');
 +    $display = $view->getDisplay('default');
 +    foreach ($display['display_options']['fields'] as $field) {
@@ -1431,15 +1399,15 @@
 +    $view = View::load('test_set_active_class');
 +    $display = $view->getDisplay('default');
 +    foreach ($display['display_options']['fields'] as $field) {
-+      $this->assertTrue(isset($field['set_active_class']));
-+      $this->assertSame(FALSE, $field['set_active_class']);
++      $this->assertArrayHasKey('set_active_class', $field);
++      $this->assertFalse($field['set_active_class']);
 +    }
 +  }
 +
 +}
 diff --git a/core/modules/views/tests/src/Functional/ViewsSetActiveClassTest.php b/core/modules/views/tests/src/Functional/ViewsSetActiveClassTest.php
 new file mode 100644
-index 0000000..8fd0d8e
+index 0000000000..d07243390e
 --- /dev/null
 +++ b/core/modules/views/tests/src/Functional/ViewsSetActiveClassTest.php
 @@ -0,0 +1,90 @@
@@ -1504,7 +1472,7 @@
 +    $link = $assert_session->elementExists('css', '.views-field-title a');
 +    $this->assertFalse($link->hasClass('is-active'), 'Node link is not marked as active.');
 +
-+    // Enable the Set the active class on links to the current page option in
++    // Enable the set_active_class on links to the current page option in
 +    // the view.
 +    $fields = $view->displayHandlers->get('default')->getOption('fields');
 +    $fields['title']['set_active_class'] = TRUE;
@@ -1534,10 +1502,10 @@
 +
 +}
 diff --git a/core/modules/views/views.post_update.php b/core/modules/views/views.post_update.php
-index 028f1eb..a05fe3b 100644
+index e22faa24e8..527c4632ca 100644
 --- a/core/modules/views/views.post_update.php
 +++ b/core/modules/views/views.post_update.php
-@@ -396,3 +396,14 @@ function views_post_update_field_names_for_multivalue_fields(&$sandbox = NULL) {
+@@ -44,3 +44,14 @@ function views_post_update_field_names_for_multivalue_fields(&$sandbox = NULL) {
      return $view_config_updater->needsMultivalueBaseFieldUpdate($view);
    });
  }
@@ -1553,7 +1521,7 @@
 +  });
 +}
 diff --git a/core/profiles/demo_umami/config/install/views.view.articles_aside.yml b/core/profiles/demo_umami/config/install/views.view.articles_aside.yml
-index 70989b3..f9a8c76 100644
+index 70989b335c..f9a8c76cde 100644
 --- a/core/profiles/demo_umami/config/install/views.view.articles_aside.yml
 +++ b/core/profiles/demo_umami/config/install/views.view.articles_aside.yml
 @@ -94,6 +94,7 @@ display:
@@ -1565,7 +1533,7 @@
            type: string
            group_column: value
 diff --git a/core/profiles/demo_umami/config/install/views.view.featured_articles.yml b/core/profiles/demo_umami/config/install/views.view.featured_articles.yml
-index 88d5550..ce689af 100644
+index 88d5550615..ce689afae5 100644
 --- a/core/profiles/demo_umami/config/install/views.view.featured_articles.yml
 +++ b/core/profiles/demo_umami/config/install/views.view.featured_articles.yml
 @@ -108,6 +108,7 @@ display:
@@ -1577,7 +1545,7 @@
            type: string
            group_column: value
 diff --git a/core/profiles/demo_umami/config/install/views.view.promoted_items.yml b/core/profiles/demo_umami/config/install/views.view.promoted_items.yml
-index ee99489..0be0343 100644
+index ee99489eb8..0be03431ba 100644
 --- a/core/profiles/demo_umami/config/install/views.view.promoted_items.yml
 +++ b/core/profiles/demo_umami/config/install/views.view.promoted_items.yml
 @@ -96,6 +96,7 @@ display:
@@ -1589,7 +1557,7 @@
            type: string
            group_column: value
 diff --git a/core/profiles/demo_umami/config/install/views.view.recipe_collections.yml b/core/profiles/demo_umami/config/install/views.view.recipe_collections.yml
-index 1257ba1..c16bede 100644
+index 1257ba1b1d..c16bede443 100644
 --- a/core/profiles/demo_umami/config/install/views.view.recipe_collections.yml
 +++ b/core/profiles/demo_umami/config/install/views.view.recipe_collections.yml
 @@ -100,6 +100,7 @@ display:
@@ -1601,7 +1569,7 @@
            group_column: value
            group_columns: {  }
 diff --git a/core/profiles/demo_umami/config/install/views.view.recipes.yml b/core/profiles/demo_umami/config/install/views.view.recipes.yml
-index 7a5bc31..79aef20 100644
+index 7a5bc31f38..79aef20b28 100644
 --- a/core/profiles/demo_umami/config/install/views.view.recipes.yml
 +++ b/core/profiles/demo_umami/config/install/views.view.recipes.yml
 @@ -108,6 +108,7 @@ display:
@@ -1613,7 +1581,7 @@
            type: string
            group_column: value
 diff --git a/core/profiles/demo_umami/config/optional/views.view.media.yml b/core/profiles/demo_umami/config/optional/views.view.media.yml
-index 584b5f5..5b9089f 100644
+index 584b5f504c..5b9089f4eb 100644
 --- a/core/profiles/demo_umami/config/optional/views.view.media.yml
 +++ b/core/profiles/demo_umami/config/optional/views.view.media.yml
 @@ -181,6 +181,7 @@ display: