Workaround for Argument 1 passed to eZPublishEventSearch::delete() mu…

…st be an instance of eZContentObject, null given Co-authored-by: xinyuexrow <wang@xrow.de>
ezpublishlegacy · Mar 22, 2018 · 4a0ef95 · 4a0ef95
1 parent a0079a5
commit 4a0ef95
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/classes/eZPublishEventSearch.php b/classes/eZPublishEventSearch.php
@@ -47,29 +47,22 @@ public static function update(eZContentObject $object, $commit = true)
         }
     }
 
-    public static function delete(eZContentObject $object, $commit = true)
+    public static function delete($contentObjectId, $commit = true)
     {
-        $ezpublishevent_ini = eZINI::instance( 'ezpublishevent.ini' );
-        if($ezpublishevent_ini->hasVariable( 'Settings', 'EventClassIdentifier' ))
+        $client = eZPublishSolarium::createSolariumClient();
+        $query = $client->createSelect();
+        $query->setQuery('meta_id_si:' . $contentObjectId);
+        $resulttest = $client->select($query);
+        if ($resulttest->getNumFound() != 0)
         {
-            $classidentifier = $ezpublishevent_ini->variable( 'Settings', 'EventClassIdentifier' );
-            if ($object->ClassIdentifier == $classidentifier)
-            {
-                $client = eZPublishSolarium::createSolariumClient();
-                $query = $client->createSelect();
-                $query->setQuery('meta_id_si:' . $object->ID);
-                $resulttest = $client->select($query);
-                if ($resulttest->getNumFound() != 0)
-                {
-                    $update = $client->createUpdate();
-                    $update->addDeleteQuery('meta_id_si:' . $object->ID);
-                    $update->addCommit();
-                    $deleteResult = $client->update($update);
-                }
-            }
+            $update = $client->createUpdate();
+            $update->addDeleteQuery('meta_id_si:' . $contentObjectId);
+            $update->addCommit();
+            $deleteResult = $client->update($update);
         }
     }
 
+
     public static function commit()
     {
         $client = eZPublishSolarium::createSolariumClient();

diff --git a/search/plugins/ezdual/ezdual.php b/search/plugins/ezdual/ezdual.php
@@ -60,10 +60,10 @@ function removeObject( $contentObject, $commit = null )
      */
     function removeObjectById( $contentObjectId, $commit = null )
     {
-        $contentObject = eZContentObject::fetch( $contentObjectId);
-        eZPublishEventSearch::delete( $contentObject, $commit );
+        eZPublishEventSearch::delete( $contentObjectId, $commit );
         return parent::removeObjectById( $contentObjectId, $commit );
     }
+
 
     /**
      * Clean up search index for current installation.