fix getAttributeOrFallback()

dimsav · Jul 24, 2018 · 40e6c39 · 40e6c39
1 parent b2130c3
commit 40e6c39
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/Translatable/Translatable.php b/src/Translatable/Translatable.php
@@ -161,17 +161,23 @@ private function usePropertyFallback()
      */
     private function getAttributeOrFallback($locale, $attribute)
     {
-        $value = $this->getTranslation($locale)->$attribute;
+        $translation = $this->getTranslation($locale);
 
         if (
-            empty($value) &&
-            $this->usePropertyFallback() &&
-            ($fallback = $this->getTranslation($this->getFallbackLocale(), true))
+            (
+                !$translation instanceof Model ||
+                empty($translation->$attribute)
+            ) &&
+            $this->usePropertyFallback()
         ) {
-            return $fallback->$attribute;
+            $translation = $this->getTranslation($this->getFallbackLocale(), true);
         }
 
-        return $value;
+        if ($translation instanceof Model) {
+            return $translation->$attribute;
+        }
+
+        return null;
     }
 
     /**