Prefer slug if both parentId/slug specified

- Will no longer throw an exception / end import if both present
artefactual · May 7, 2014 · 458f6a4 · 458f6a4
1 parent 274be67
commit 458f6a4
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/lib/task/import/csvImportTask.class.php b/lib/task/import/csvImportTask.class.php
@@ -466,16 +466,6 @@ public function execute($arguments = array(), $options = array())
 
         $self->object->setPublicationStatus($pubStatusTermId);
 
-        if (
-          isset($self->rowStatusVars['qubitParentSlug'])
-          && $self->rowStatusVars['qubitParentSlug']
-          && isset($self->rowStatusVars['parentId'])
-          && $self->rowStatusVars['parentId']
-        )
-        {
-          throw new sfException('Both parentId and qubitParentSlug are set: only one should be set.');
-        }
-
         if (
           isset($self->rowStatusVars['qubitParentSlug'])
           && $self->rowStatusVars['qubitParentSlug']