From dc925cc9c5461ca4160c685cd40a4a769bc168eb Mon Sep 17 00:00:00 2001
From: Stefan Kleff <s.kleff@goalio.de>
Date: Thu, 10 Jan 2013 15:19:44 +0100
Subject: [PATCH] fixed indentation Restored old way of injection to just
inject it during a refresh Added injection for initialized proxies
---
lib/Doctrine/ORM/UnitOfWork.php | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 6e7eeb129..356ea02b2 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -2478,6 +2478,11 @@ class UnitOfWork implements PropertyChangedListener
$entity->addPropertyChangedListener($this);
}
+ // inject ObjectManager into just loaded proxies.
+ if ($overrideLocalValues && $entity instanceof ObjectManagerAware) {
+ $entity->injectObjectManager($this->em, $class);
+ }
+
} else {
$overrideLocalValues = isset($hints[Query::HINT_REFRESH]);
@@ -2485,12 +2490,12 @@ class UnitOfWork implements PropertyChangedListener
if(isset($hints[Query::HINT_REFRESH_ENTITY])) {
$overrideLocalValues = $hints[Query::HINT_REFRESH_ENTITY] === $entity;
}
+
+ // inject ObjectManager upon refresh.
+ if ($overrideLocalValues && $entity instanceof ObjectManagerAware) {
+ $entity->injectObjectManager($this->em, $class);
+ }
}
-
- // inject ObjectManager into just loaded proxies.
- if ($overrideLocalValues && $entity instanceof ObjectManagerAware) {
- $entity->injectObjectManager($this->em, $class);
- }
if ($overrideLocalValues) {
$this->originalEntityData[$oid] = $data;