Merge pull request #890 from ngodfraind/bugfixes

NULL not merged to the em anymore.
claroline · Oct 3, 2014 · eece607 · eece607
2 parents 625c550 + 39688cb
commit eece607
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Listener/Log/LogListener.php b/Listener/Log/LogListener.php
@@ -108,7 +108,7 @@ private function createLog(LogGenericEvent $event)
         if (!($event->getAction() === LogUserDeleteEvent::ACTION && $event->getReceiver() === $doer)) {
             //Prevent self delete case
             //Sometimes, the entity manager has been cleared, so we must merge the doer.
-            $doer = $this->om->merge($doer);
+           if ($doer) $doer = $this->om->merge($doer);
             $log->setDoer($doer);
         }
         $log->setDoerType($doerType);