Merge remote-tracking branch 'remotes/dev/1.9' into 1.5

freliberty · Apr 26, 2016 · 55a3281 · 55a3281
2 parents 2e73f97 + 4c0c3fa
commit 55a3281
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ImportExport/Strategy/StaticSegmentImportStrategy.php b/ImportExport/Strategy/StaticSegmentImportStrategy.php
@@ -14,9 +14,10 @@ protected function processEntity(
         $isFullData = false,
         $isPersistNew = false,
         $itemData = null,
-        array $searchContext = []
+        array $searchContext = [],
+        $entityIsRelation = false
     ) {
-        return parent::processEntity($entity, $isFullData, false, $itemData, $searchContext);
+        return parent::processEntity($entity, $isFullData, false, $itemData, $searchContext, $entityIsRelation);
     }
 
     /**