hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Romain Neutron
2012-09-27 14:53:24 +02:00
parent b10c6120fa
commit 2aae5331ab
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Application/Lightbox.php
View File

@@ -440,8 +440,8 @@ return call_user_func(
/* @var $basket \Entities\Basket */ /* @var $basket \Entities\Basket */
$participant = $basket->getValidation()->getParticipant($user); $participant = $basket->getValidation()->getParticipant($user);
$appbox = \appbox::get_instance($app['Core']); $appbox = \appbox::get_instance($app['phraseanet.core']);
$evt_mngr = $app['Core']['events-manager']; $evt_mngr = $app['phraseanet.core']['events-manager'];
$expires = new \DateTime('+10 days'); $expires = new \DateTime('+10 days');
$url = $app['phraseanet.appbox']->get_registry()->get('GV_ServerName') $url = $app['phraseanet.appbox']->get_registry()->get('GV_ServerName')

4
lib/Alchemy/Phrasea/Controller/Prod/Push.php
View File

@@ -178,7 +178,7 @@ class Push implements ControllerProviderInterface
throw new ControllerException(_('No elements to push')); throw new ControllerException(_('No elements to push'));
} }
$events_manager = $app['Core']['events-manager']; $events_manager = $app['phraseanet.core']['events-manager'];
foreach ($receivers as $receiver) { foreach ($receivers as $receiver) {
try { try {
@@ -284,7 +284,7 @@ class Push implements ControllerProviderInterface
$pusher = new RecordHelper\Push($app['phraseanet.core'], $app['request']); $pusher = new RecordHelper\Push($app['phraseanet.core'], $app['request']);
$user = $app['phraseanet.core']->getAuthenticatedUser(); $user = $app['phraseanet.core']->getAuthenticatedUser();
$events_manager = $app['Core']['events-manager']; $events_manager = $app['phraseanet.core']['events-manager'];
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');

2
lib/Alchemy/Phrasea/Controller/Prod/Root.php
View File

@@ -100,7 +100,7 @@ class Root implements ControllerProviderInterface
'module_prod' => new Helper\Prod($app['phraseanet.core'], $app['request']), 'module_prod' => new Helper\Prod($app['phraseanet.core'], $app['request']),
'cssfile' => $cssfile, 'cssfile' => $cssfile,
'module' => 'prod', 'module' => 'prod',
'events' => $app['Core']['events-manager'], 'events' => $app['phraseanet.core']['events-manager'],
'GV_defaultQuery_type' => $registry->get('GV_defaultQuery_type'), 'GV_defaultQuery_type' => $registry->get('GV_defaultQuery_type'),
'GV_multiAndReport' => $registry->get('GV_multiAndReport'), 'GV_multiAndReport' => $registry->get('GV_multiAndReport'),
'GV_thesaurus' => $registry->get('GV_thesaurus'), 'GV_thesaurus' => $registry->get('GV_thesaurus'),

2
lib/Alchemy/Phrasea/Controller/Prod/Tools.php
View File

@@ -134,7 +134,7 @@ class Tools implements ControllerProviderInterface
, $request->request->get('record_id') , $request->request->get('record_id')
); );
$media = $app['Core']['mediavorus']->guess($tempoFile); $media = $app['phraseanet.core']['mediavorus']->guess($tempoFile);
$record->substitute_subdef('document', $media); $record->substitute_subdef('document', $media);

2
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
View File

@@ -249,7 +249,7 @@ class Upload implements ControllerProviderInterface
$appbox = $app['phraseanet.appbox']; $appbox = $app['phraseanet.appbox'];
$eventsManager = $app['Core']['events-manager']; $eventsManager = $app['phraseanet.core']['events-manager'];
$eventsManager->trigger('__UPLOAD_QUARANTINE__', $params); $eventsManager->trigger('__UPLOAD_QUARANTINE__', $params);
$id = $elementCreated->getId(); $id = $elementCreated->getId();