From affd3e28e02ce8be9f0963115b88d156ccefd8c1 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Tue, 27 Dec 2011 15:35:03 +0100
Subject: [PATCH] Fix Core load event manager

---
 lib/Alchemy/Phrasea/Core.php               | 4 ++--
 lib/classes/eventsmanager/broker.class.php | 8 ++++----
 lib/classes/phrasea.class.php              | 6 ------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Core.php b/lib/Alchemy/Phrasea/Core.php
index e5782f2f8c..e5a0fee9f4 100644
--- a/lib/Alchemy/Phrasea/Core.php
+++ b/lib/Alchemy/Phrasea/Core.php
@@ -224,8 +224,8 @@ class Core extends \Pimple
 
   protected function enableEvents()
   {
-
-    \phrasea::load_events();
+    $events = \eventsmanager_broker::getInstance(appbox::get_instance(), $this);
+    $events->start();
 
     return;
   }
diff --git a/lib/classes/eventsmanager/broker.class.php b/lib/classes/eventsmanager/broker.class.php
index b8643a74db..6a8712cb83 100644
--- a/lib/classes/eventsmanager/broker.class.php
+++ b/lib/classes/eventsmanager/broker.class.php
@@ -18,10 +18,10 @@ class eventsmanager_broker
    */
   protected $core;
 
-  private function __construct(appbox &$appbox)
+  private function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core)
   {
     $this->appbox = $appbox;
-    $this->core = bootstrap::getCore();
+    $this->core = $core;
 
     return $this;
   }
@@ -29,11 +29,11 @@ class eventsmanager_broker
   /**
    * @return eventsmanager
    */
-  public static function getInstance(appbox &$appbox)
+  public static function getInstance(appbox &$appbox, \Alchemy\Phrasea\Core $core)
   {
     if (!self::$_instance)
     {
-      self::$_instance = new self($appbox);
+      self::$_instance = new self($appbox, $core);
     }
 
     return self::$_instance;
diff --git a/lib/classes/phrasea.class.php b/lib/classes/phrasea.class.php
index 07d05537ce..e4d3a54c9f 100644
--- a/lib/classes/phrasea.class.php
+++ b/lib/classes/phrasea.class.php
@@ -269,12 +269,6 @@ class phrasea
     return $user->ACL()->get_granted_base() > 0;
   }
 
-  public static function load_events()
-  {
-    $events = eventsmanager_broker::getInstance(appbox::get_instance());
-    $events->start();
-  }
-
   public static function use_i18n($locale, $textdomain = 'phraseanet')
   {
     $codeset = "UTF-8";