Fix issue with 500 error when session not exists in request object

sourcefabric · Nov 9, 2015 · b3c1e2e · b3c1e2e
1 parent 2cda2d3
commit b3c1e2e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/newscoop/src/Newscoop/NewscoopBundle/EventListener/LocaleListener.php b/newscoop/src/Newscoop/NewscoopBundle/EventListener/LocaleListener.php
@@ -61,7 +61,7 @@ public function onRequest(GetResponseEvent $event)
 
  } else {
  // Session language
- if ($session->has('languageCode')) {
+ if ($session && $session->has('languageCode')) {
  $languageCode = $session->get('languageCode');
  }
 
@@ -101,7 +101,9 @@ public function onRequest(GetResponseEvent $event)
  $languageCode = $publicationMetadata['publication']['code_default_language'];
  }
 
- $session->set('languageCode', $languageCode);
+ if ($session) {
+ $session->set('languageCode', $languageCode);
+ }
  }
 
  if (!is_null($languageCode)) {