From 1910da4e9705268d2c5478971eaa07f17ee2bedd Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Mon, 23 Dec 2013 11:23:01 +0100 Subject: [PATCH] Fix #1640 : Only add search engine subscriber when the app is setup --- .../Core/Provider/SearchEngineServiceProvider.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php index e2dc672a4d..6468771ab9 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php @@ -49,12 +49,14 @@ class SearchEngineServiceProvider implements ServiceProviderInterface public function boot(Application $app) { - $app['dispatcher'] = $app->share( - $app->extend('dispatcher', function ($dispatcher, Application $app) { - $dispatcher->addSubscriber($app['phraseanet.SE.subscriber']); + if ($app['phraseanet.configuration']->isSetup()) { + $app['dispatcher'] = $app->share( + $app->extend('dispatcher', function ($dispatcher, Application $app) { + $dispatcher->addSubscriber($app['phraseanet.SE.subscriber']); - return $dispatcher; - }) - ); + return $dispatcher; + }) + ); + } } }