Merge pull request #60 from dommmel/patch-1

Quick fix for #58
verbb · Mar 16, 2016 · c83cb4f · c83cb4f
2 parents d18ed3c + 8dc4363
commit c83cb4f
Showing 1 changed file with 31 additions and 29 deletions.
diff --git a/supertable/fieldtypes/SuperTableFieldType.php b/supertable/fieldtypes/SuperTableFieldType.php
@@ -356,38 +356,40 @@ public function validate($blocks)
 
     public function getSearchKeywords($value)
     {
-        $keywords = array();
-        $contentService = craft()->content;
-
-        if ($this->settings->staticField) {
-            $value = array($value);
-        }
-
-        foreach ($value as $block) {
-            $originalContentTable      = $contentService->contentTable;
-            $originalFieldColumnPrefix = $contentService->fieldColumnPrefix;
-            $originalFieldContext      = $contentService->fieldContext;
-
-            $contentService->contentTable      = $block->getContentTable();
-            $contentService->fieldColumnPrefix = $block->getFieldColumnPrefix();
-            $contentService->fieldContext      = $block->getFieldContext();
-
-            foreach (craft()->fields->getAllFields() as $field) {
-                $fieldType = $field->getFieldType();
-
-                if ($fieldType) {
-                    $fieldType->element = $block;
-                    $handle = $field->handle;
-                    $keywords[] = $fieldType->getSearchKeywords($block->getFieldValue($handle));
+        if ($value)
+        {
+            $keywords = array();
+            $contentService = craft()->content;
+
+            if ($this->settings->staticField) {
+                $value = array($value);
+            }
+
+            foreach ($value as $block) {
+                $originalContentTable      = $contentService->contentTable;
+                $originalFieldColumnPrefix = $contentService->fieldColumnPrefix;
+                $originalFieldContext      = $contentService->fieldContext;
+
+                $contentService->contentTable      = $block->getContentTable();
+                $contentService->fieldColumnPrefix = $block->getFieldColumnPrefix();
+                $contentService->fieldContext      = $block->getFieldContext();
+
+                foreach (craft()->fields->getAllFields() as $field) {
+                    $fieldType = $field->getFieldType();
+
+                    if ($fieldType) {
+                        $fieldType->element = $block;
+                        $handle = $field->handle;
+                        $keywords[] = $fieldType->getSearchKeywords($block->getFieldValue($handle));
+                    }
                 }
+
+                $contentService->contentTable      = $originalContentTable;
+                $contentService->fieldColumnPrefix = $originalFieldColumnPrefix;
+                $contentService->fieldContext      = $originalFieldContext;
             }
-
-            $contentService->contentTable      = $originalContentTable;
-            $contentService->fieldColumnPrefix = $originalFieldColumnPrefix;
-            $contentService->fieldContext      = $originalFieldContext;
+            return parent::getSearchKeywords($keywords);
         }
-
-        return parent::getSearchKeywords($keywords);
     }
 
     public function onAfterElementSave()