Merge pull request #279 from sebastienheyd/master

Closes #186
VentureCraft · May 22, 2017 · 1b7c48b · 1b7c48b
2 parents 5a76d29 + 05aedc6
commit 1b7c48b
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/Venturecraft/Revisionable/Revision.php b/src/Venturecraft/Revisionable/Revision.php
@@ -160,14 +160,16 @@ private function getValue($which = 'new')
                         return $this->format($this->key, $item->getRevisionUnknownString());
                     }
 
+                    // Check if model use RevisionableTrait
+                    if(method_exists($item, 'identifiableName')) {
+                        // see if there's an available mutator
+                        $mutator = 'get' . studly_case($this->key) . 'Attribute';
+                        if (method_exists($item, $mutator)) {
+                            return $this->format($item->$mutator($this->key), $item->identifiableName());
+                        }
 
-                    // see if there's an available mutator
-                    $mutator = 'get' . studly_case($this->key) . 'Attribute';
-                    if (method_exists($item, $mutator)) {
-                        return $this->format($item->$mutator($this->key), $item->identifiableName());
+                        return $this->format($this->key, $item->identifiableName());
                     }
-
-                    return $this->format($this->key, $item->identifiableName());
                 }
             } catch (\Exception $e) {
                 // Just a fail-safe, in the case the data setup isn't as expected