prevent creating search docs for unpublished pages

HelloBetterLTD · Dec 5, 2019 · b91d2c1 · b91d2c1
1 parent 9b8fb43
commit b91d2c1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/Extensions/SearchDocumentGenerator.php b/src/Extensions/SearchDocumentGenerator.php
@@ -100,10 +100,18 @@ public static function case_create_document(DataObject $object)
     {
         $schema = DataObject::getSchema();
         $fields = $schema->databaseFields($object->ClassName);
-        if(array_key_exists('ShowInSearch', $fields)) {
-            return $object->getField('ShowInSearch');
+        $ret = true;
+        if (self::is_versioned($object)) {
+            if (!$object->isPublished()) {
+                $ret = false;
+            }
+        }
+        if ($ret) {
+            if (array_key_exists('ShowInSearch', $fields)) {
+                $ret = $object->getField('ShowInSearch');
+            }
         }
-        return true;
+        return $ret;
     }
 
     public static function is_versioned(DataObject $object)

diff --git a/src/ORM/Connect/MySQLDatabase.php b/src/ORM/Connect/MySQLDatabase.php
@@ -175,7 +175,7 @@ public function searchEngine(
 
         foreach ($records as $record) {
             $object = DataList::create($record['ClassName'])->byID($record['ID']);
-            if ($object->canView()) {
+            if ($object && $object->canView()) {
                 $objects[] = $object;
             }
         }