From e217a49f6afb666b56e21c375ba3c415e69b8e6b Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Tue, 21 Feb 2012 16:10:16 +0100
Subject: [PATCH] Refactor Appbox

---
 lib/Doctrine/Entities/Basket.php                | 4 ++--
 lib/Doctrine/Entities/StoryWZ.php               | 2 +-
 lib/Doctrine/Entities/UsrListEntry.php          | 2 +-
 lib/Doctrine/Entities/UsrListOwner.php          | 2 +-
 lib/Doctrine/Entities/ValidationParticipant.php | 2 +-
 lib/Doctrine/Entities/ValidationSession.php     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Doctrine/Entities/Basket.php b/lib/Doctrine/Entities/Basket.php
index d5ffde4ea5..0d13c00848 100644
--- a/lib/Doctrine/Entities/Basket.php
+++ b/lib/Doctrine/Entities/Basket.php
@@ -253,7 +253,7 @@ class Basket
   {
     if ($this->getPusherId())
     {
-      return new \User_Adapter($this->getPusherId(), \appbox::get_instance());
+      return new \User_Adapter($this->getPusherId(), \appbox::get_instance(\bootstrap::getCore()));
     }
   }
 
@@ -266,7 +266,7 @@ class Basket
   {
     if ($this->getUsrId())
     {
-      return new \User_Adapter($this->getUsrId(), \appbox::get_instance());
+      return new \User_Adapter($this->getUsrId(), \appbox::get_instance(\bootstrap::getCore()));
     }
   }
 
diff --git a/lib/Doctrine/Entities/StoryWZ.php b/lib/Doctrine/Entities/StoryWZ.php
index 4c6623d287..7331f1d396 100644
--- a/lib/Doctrine/Entities/StoryWZ.php
+++ b/lib/Doctrine/Entities/StoryWZ.php
@@ -149,7 +149,7 @@ class StoryWZ
   {
     if ($this->getUsrId())
     {
-      return new \User_Adapter($this->getUsrId(), \appbox::get_instance());
+      return new \User_Adapter($this->getUsrId(), \appbox::get_instance(\bootstrap::getCore()));
     }
   }
 
diff --git a/lib/Doctrine/Entities/UsrListEntry.php b/lib/Doctrine/Entities/UsrListEntry.php
index ae4c917160..1b1f66c636 100644
--- a/lib/Doctrine/Entities/UsrListEntry.php
+++ b/lib/Doctrine/Entities/UsrListEntry.php
@@ -136,7 +136,7 @@ class UsrListEntry
 
   public function getUser()
   {
-    return \User_Adapter::getInstance($this->getUsrId(), \appbox::get_instance());
+    return \User_Adapter::getInstance($this->getUsrId(), \appbox::get_instance(\bootstrap::getCore()));
   }
   public function setUser(\User_Adapter $user)
   {
diff --git a/lib/Doctrine/Entities/UsrListOwner.php b/lib/Doctrine/Entities/UsrListOwner.php
index 1fc63c7152..9abc4f5b8b 100644
--- a/lib/Doctrine/Entities/UsrListOwner.php
+++ b/lib/Doctrine/Entities/UsrListOwner.php
@@ -172,7 +172,7 @@ class UsrListOwner
 
   public function getUser()
   {
-    return \User_Adapter::getInstance($this->getUsrId(), \appbox::get_instance());
+    return \User_Adapter::getInstance($this->getUsrId(), \appbox::get_instance(\bootstrap::getCore()));
   }
 
 }
diff --git a/lib/Doctrine/Entities/ValidationParticipant.php b/lib/Doctrine/Entities/ValidationParticipant.php
index a70d313cbe..3fc0c00963 100644
--- a/lib/Doctrine/Entities/ValidationParticipant.php
+++ b/lib/Doctrine/Entities/ValidationParticipant.php
@@ -164,7 +164,7 @@ class ValidationParticipant
 
   public function getUser()
   {
-    return \User_Adapter::getInstance($this->getUsrId(), \appbox::get_instance());
+    return \User_Adapter::getInstance($this->getUsrId(), \appbox::get_instance(\bootstrap::getCore()));
   }
 
   /**
diff --git a/lib/Doctrine/Entities/ValidationSession.php b/lib/Doctrine/Entities/ValidationSession.php
index be6128b302..812ba9364f 100644
--- a/lib/Doctrine/Entities/ValidationSession.php
+++ b/lib/Doctrine/Entities/ValidationSession.php
@@ -329,7 +329,7 @@ class ValidationSession
   {
     if ($this->initiator_id)
     {
-      return \User_Adapter::getInstance($this->initiator_id, \appbox::get_instance());
+      return \User_Adapter::getInstance($this->initiator_id, \appbox::get_instance(\bootstrap::getCore()));
     }
   }