Fixed #3837

craftcms · Feb 13, 2019 · d97f077 · d97f077
1 parent e314415
commit d97f077
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -5,6 +5,7 @@
 ### Fixed
 - Fixed a bug where the `users/save-user` action wasn’t deleting user photos properly.
 - Fixed a bug where changes to Matrix block type fields’ settings weren’t always saving. ([#3832](https://github.com/craftcms/cms/issues/3832))
+- Fixed a bug where non-searchable fields were still getting search keywords stored when using the Search Indexes utility. ([#3837](https://github.com/craftcms/cms/issues/3837))
 
 ## 3.1.9.1 - 2019-02-12
 

diff --git a/src/controllers/UtilitiesController.php b/src/controllers/UtilitiesController.php
@@ -495,10 +495,12 @@ public function actionSearchIndexPerformAction(): Response
 
                     foreach ($fieldLayout->getFields() as $field) {
                         /** @var Field $field */
-                        // Set the keywords for the content's site
-                        $fieldValue = $element->getFieldValue($field->handle);
-                        $fieldSearchKeywords = $field->getSearchKeywords($fieldValue, $element);
-                        $keywords[$field->id] = $fieldSearchKeywords;
+                        if ($field->searchable) {
+                            // Set the keywords for the content's site
+                            $fieldValue = $element->getFieldValue($field->handle);
+                            $fieldSearchKeywords = $field->getSearchKeywords($fieldValue, $element);
+                            $keywords[$field->id] = $fieldSearchKeywords;
+                        }
                     }
 
                     $searchService->indexElementFields($element->id, $siteId, $keywords);