From f0f2ebdf0795141593aeedb8fae9f2b2ffae2e07 Mon Sep 17 00:00:00 2001
From: Dan Chadwick <dan899@gmail.com>
Date: Wed, 4 Mar 2015 11:35:23 -0500
Subject: [PATCH] Issue #2445931 by DanChadwick: Webform advanced feature to
 index forms should be replace by view mode.

---
 config/install/webform.settings.yml |    1 -
 src/Form/WebformSettingsForm.php    |   10 ----------
 webform.install                     |    1 -
 webform.module                      |    5 -----
 4 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/config/install/webform.settings.yml b/config/install/webform.settings.yml
index 5c2c19e..cb68943 100644
--- a/config/install/webform.settings.yml
+++ b/config/install/webform.settings.yml
@@ -14,7 +14,6 @@ progressbar:
   label_first: 'Start'
   label_confirmation: 'Complete'
 advanced:
-  search_index: 1
   tracking_mode: 'cookie'
   email_address_format: 'long'
   export_format: 'excel'
diff --git a/src/Form/WebformSettingsForm.php b/src/Form/WebformSettingsForm.php
index 53dfdee..e7d1cd3 100644
--- a/src/Form/WebformSettingsForm.php
+++ b/src/Form/WebformSettingsForm.php
@@ -141,15 +141,6 @@ class WebformSettingsForm extends ConfigFormBase {
       '#open' => FALSE,
     );
 
-    $form['advanced']['search_index']  = array(
-      '#type' => 'checkbox',
-      '#checked_value' => 1,
-      '#title' => t('Include webform forms in search index'),
-      '#default_value' => $config->get('advanced.search_index'),
-      '#description' => t('When selected, all Webform nodes will have their form components indexed by the search engine.'),
-      '#access' => \Drupal::moduleHandler()->moduleExists('search'),
-    );
-
     $form['advanced']['tracking_mode']  = array(
       '#type' => 'radios',
       '#title' => t('Track anonymous users by:'),
@@ -256,7 +247,6 @@ class WebformSettingsForm extends ConfigFormBase {
       ->set('progressbar.style', $values['progressbar']['style'])
       ->set('progressbar.label_first', $values['progressbar']['label_first'])
       ->set('progressbar.label_confirmation', $values['progressbar']['label_confirmation'])
-      ->set('advanced.search_index', $values['advanced']['search_index'])
       ->set('advanced.tracking_mode', $values['advanced']['tracking_mode'])
       ->set('advanced.email_address_format', $values['advanced']['email_address_format'])
       ->set('advanced.export_format', $values['advanced']['export_format'])
diff --git a/webform.install b/webform.install
index 0c44697..5cb40c7 100644
--- a/webform.install
+++ b/webform.install
@@ -653,7 +653,6 @@ function webform_uninstall() {
   $config->clear('format_override');
   $config->clear('allowed_tags');
   $config->clear('blocks');
-  $config->clear('advanced.search_index');
   $config->clear('advanced.tracking_mode');
   $config->clear('advanced.email_address_format');
   $config->clear('advanced.export_format');
diff --git a/webform.module b/webform.module
index 6bccfff..9150c81 100644
--- a/webform.module
+++ b/webform.module
@@ -1789,11 +1789,6 @@ function webform_node_view(array &$build, EntityInterface $node, EntityViewDispl
     return;
   }
 
-  // Do not include the form in the search index if indexing is disabled.
-  if (\Drupal::moduleHandler()->moduleExists('search') && $view_mode == 'search_index' && !$config->get('advanced.search_index')) {
-    return;
-  }
-
   // If the webform is not set to display in this view mode, return early.
   $extra_fields = field_extra_fields_get_display('node', $node->type, $view_mode);
   if (empty($extra_fields['webform']['visible'])) {
-- 
1.7.8.msysgit.0