Merge branch 'master' of git://github.com/Opifer/Cms

Opifer · Jan 29, 2016 · d2f9f16 · d2f9f16
2 parents 21970f3 + bcdf24f
commit d2f9f16
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Model/Content.php b/Model/Content.php
@@ -689,6 +689,11 @@ public function getValueSet()
     public function getAttributes()
     {
         $array = [];
+
+        if ($this->getValueSet() === null) {
+            return $array;
+        }
+
         foreach ($this->getValueSet()->getValues() as $value) {
             $array[$value->getAttribute()->getName()] = $value;
         }