oh lol

c2is · Nov 7, 2014 · ca1baaf · ca1baaf
1 parent 2082e4c
commit ca1baaf
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/Entity/TranslationRepository.php b/Entity/TranslationRepository.php
@@ -59,25 +59,22 @@ public function translate($entity, $field, $locale, $fieldData)
             $listener->setTranslationInDefaultLocale(spl_object_hash($entity), $field, $trans);
         } else {
             $translationClassRepository = $this->em->getRepository($entityTranslationClass);
-            $meta = $em->getClassMetadata(get_class($entity));
-            $identifier = $meta->getSingleIdentifierFieldName();
+            $meta        = $em->getClassMetadata(get_class($entity));
+            $identifier  = $meta->getSingleIdentifierFieldName();
+            $translation = null;
 
-            if ($this->propertyAccessor->getValue($entity->getId(), $identifier)) {
+            if ($entity && $this->propertyAccessor->getValue($entity, $identifier)) {
                 $translation = $translationClassRepository->findOneBy(array(
                     'locale' => $locale,
                     'field'  => $field,
                     'object' => $entity,
                 ));
-            } else {
-                $translation = null;
             }
 
             if ($translation) {
                 $translation->setContent($fieldData);
-            } else {
-                if ($fieldData !== null) {
-                    $entity->addTranslation(new $entityTranslationClass($locale, $field, $fieldData));
-                }
+            } elseif ($fieldData !== null) {
+                $entity->addTranslation(new $entityTranslationClass($locale, $field, $fieldData));
             }
         }
     }