Reintegrate fixes from Master branch

analogueorm · Sep 23, 2015 · 19bc7c4 · 19bc7c4
1 parent 9df7ea3
commit 19bc7c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Entity.php b/src/Entity.php
@@ -107,6 +107,7 @@ public function toArray()
             if(in_array($key, $this->hidden))
 			{
 				unset($attributes[$key]);
+                continue;
 			}
 			if($this->hasGetMutator($key))
 			{

diff --git a/src/System/Manager.php b/src/System/Manager.php
@@ -197,7 +197,9 @@ public function register($entity, $entityMap = null)
 		}
 
 		$entityMap->setClass($entity);
-
+
+        $entityMap->setManager($this);
+
 		$this->entityClasses[$entity] = $entityMap;
 	}
 
@@ -220,8 +222,6 @@ protected function getEntityMapInstanceFor($entity)
             $map = $this->getNewEntityMap();
         }
 
-        $map->setManager($this);
-
         return $map;
     }