Merge pull request #2166 from cmfcmf/category-fix-1.3

[1.3] Corrected behaviour of CategorySelector if no category is selected
zikula · Jan 5, 2015 · 07141db · 07141db
2 parents bf1eed3 + 89215ec
commit 07141db
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/lib/Zikula/Form/Plugin/CategorySelector.php b/src/lib/Zikula/Form/Plugin/CategorySelector.php
@@ -272,7 +272,10 @@ public function saveValue(Zikula_Form_View $view, &$data)
             //$em->flush();
 
             foreach ($selectedValues as $selectedValue) {
-
+                if ($selectedValue === null) {
+                    // If no category has been selected.
+                    continue;
+                }
                 $category = $em->find('Zikula_Doctrine2_Entity_Category', $selectedValue);
                 $class = $em->getClassMetadata(get_class($entity))->getAssociationTargetClass($this->dataField);
                 $collection->add(new $class($this->registryId, $category, $entity));