From 2aae5331ab1789edbd65d4b4d2a9dc63b020f00c Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 27 Sep 2012 14:53:24 +0200
Subject: [PATCH] Fix merge

---
 lib/Alchemy/Phrasea/Application/Lightbox.php   | 4 ++--
 lib/Alchemy/Phrasea/Controller/Prod/Push.php   | 4 ++--
 lib/Alchemy/Phrasea/Controller/Prod/Root.php   | 2 +-
 lib/Alchemy/Phrasea/Controller/Prod/Tools.php  | 2 +-
 lib/Alchemy/Phrasea/Controller/Prod/Upload.php | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Application/Lightbox.php b/lib/Alchemy/Phrasea/Application/Lightbox.php
index 688f9f31e8..b9cd048a9e 100644
--- a/lib/Alchemy/Phrasea/Application/Lightbox.php
+++ b/lib/Alchemy/Phrasea/Application/Lightbox.php
@@ -440,8 +440,8 @@ return call_user_func(
                         /* @var $basket \Entities\Basket */
                         $participant = $basket->getValidation()->getParticipant($user);
 
-                        $appbox = \appbox::get_instance($app['Core']);
-                        $evt_mngr = $app['Core']['events-manager'];
+                        $appbox = \appbox::get_instance($app['phraseanet.core']);
+                        $evt_mngr = $app['phraseanet.core']['events-manager'];
 
                         $expires = new \DateTime('+10 days');
                         $url = $app['phraseanet.appbox']->get_registry()->get('GV_ServerName')
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Push.php b/lib/Alchemy/Phrasea/Controller/Prod/Push.php
index 193eef9451..d14bb56676 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Push.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Push.php
@@ -178,7 +178,7 @@ class Push implements ControllerProviderInterface
                         throw new ControllerException(_('No elements to push'));
                     }
 
-                    $events_manager = $app['Core']['events-manager'];
+                    $events_manager = $app['phraseanet.core']['events-manager'];
 
                     foreach ($receivers as $receiver) {
                         try {
@@ -284,7 +284,7 @@ class Push implements ControllerProviderInterface
                     $pusher = new RecordHelper\Push($app['phraseanet.core'], $app['request']);
                     $user = $app['phraseanet.core']->getAuthenticatedUser();
 
-                    $events_manager = $app['Core']['events-manager'];
+                    $events_manager = $app['phraseanet.core']['events-manager'];
 
                     $repository = $em->getRepository('\Entities\Basket');
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php
index 9ddae1503e..332a148ceb 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php
@@ -100,7 +100,7 @@ class Root implements ControllerProviderInterface
                     'module_prod'          => new Helper\Prod($app['phraseanet.core'], $app['request']),
                     'cssfile'              => $cssfile,
                     'module'               => 'prod',
-                    'events'               => $app['Core']['events-manager'],
+                    'events'               => $app['phraseanet.core']['events-manager'],
                     'GV_defaultQuery_type' => $registry->get('GV_defaultQuery_type'),
                     'GV_multiAndReport'    => $registry->get('GV_multiAndReport'),
                     'GV_thesaurus'         => $registry->get('GV_thesaurus'),
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Tools.php b/lib/Alchemy/Phrasea/Controller/Prod/Tools.php
index da9a8a56a1..84c6938197 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Tools.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Tools.php
@@ -134,7 +134,7 @@ class Tools implements ControllerProviderInterface
                                     , $request->request->get('record_id')
                             );
 
-                            $media = $app['Core']['mediavorus']->guess($tempoFile);
+                            $media = $app['phraseanet.core']['mediavorus']->guess($tempoFile);
 
                             $record->substitute_subdef('document', $media);
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php b/lib/Alchemy/Phrasea/Controller/Prod/Upload.php
index 6e15a11aeb..e5a5b2a589 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Upload.php
@@ -249,7 +249,7 @@ class Upload implements ControllerProviderInterface
 
                 $appbox = $app['phraseanet.appbox'];
 
-                $eventsManager = $app['Core']['events-manager'];
+                $eventsManager = $app['phraseanet.core']['events-manager'];
                 $eventsManager->trigger('__UPLOAD_QUARANTINE__', $params);
 
                 $id = $elementCreated->getId();