Issue #2304461 by sun: Fixed DependencySerializationTrait breaks sans…

… container.
sun · Aug 1, 2014 · 3c0635a · 3c0635a
1 parent 2004790
commit 3c0635a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php b/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
@@ -49,9 +49,10 @@ public function __sleep() {
    * {@inheritdoc}
    */
   public function __wakeup() {
-    $container = \Drupal::getContainer();
-    foreach ($this->_serviceIds as $key => $service_id) {
-      $this->$key = $container->get($service_id);
+    if ($container = \Drupal::getContainer()) {
+      foreach ($this->_serviceIds as $key => $service_id) {
+        $this->$key = $container->get($service_id);
+      }
     }
     $this->_serviceIds = array();
   }