Ver código fonte

Fixed mistake with initializing

Dmitry Pikhno 13 anos atrás
pai
commit
3359349544

+ 0 - 1
lib/Gedmo/Translatable/Mapping/Driver/Annotation.php

@@ -86,7 +86,6 @@ class Annotation implements AnnotationDriverInterface
             $config['translationClass'] = $annot->class;
         }
 
-        $config['nofallback'] = array();
         // property annotations
         foreach ($class->getProperties() as $property) {
             if ($meta->isMappedSuperclass && !$property->isPrivate() ||

+ 1 - 1
lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php

@@ -305,7 +305,7 @@ class TranslationWalker extends SqlWalker
                 }
 
                 // Fallback to original if was asked for
-                if ($this->needsFallback() && !in_array($field, $config['nofallback'])) {
+                if ($this->needsFallback() && (!isset($config['nofallback']) || !in_array($field, $config['nofallback']))) {
                     $substituteField = 'COALESCE('.$substituteField.', '.$originalField.')';
                 }
 

+ 1 - 1
lib/Gedmo/Translatable/TranslatableListener.php

@@ -412,7 +412,7 @@ class TranslatableListener extends MappedEventSubscriber
                     }
                 }
                 // update translation
-                if ($translated || !$this->translationFallback || in_array($field, $config['nofallback'])) {
+                if ($translated || !$this->translationFallback  || (isset($config['nofallback']) && in_array($field, $config['nofallback']))) {
                     $ea->setTranslationValue($object, $field, $translated);
                     // ensure clean changeset
                     $ea->setOriginalObjectProperty(