accommodate blameable user value when installing. fixes #1704

zikula · Jun 4, 2014 · d5ef2b8 · d5ef2b8
1 parent bda9e4c
commit d5ef2b8
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/lib/Zikula/Bundle/CoreBundle/EventListener/BlameListener.php b/src/lib/Zikula/Bundle/CoreBundle/EventListener/BlameListener.php
@@ -37,13 +37,18 @@ public function onKernelRequest(GetResponseEvent $event)
 
     public function onPostInit(GenericEvent $event)
     {
-        if (\System::isInstalling()) {
-            return;
-        }
-
         $em = ServiceUtil::get('doctrine.entitymanager');
-        $user = $em->getRepository('ZikulaUsersModule:UserEntity')->findOneBy(array('uid' => UserUtil::getVar('uid')));
-        $this->blameableListener->setUserValue($user);
+        try {
+            if (\System::isInstalling()) {
+                $uid = 2;
+            } else {
+                $uid = UserUtil::getVar('uid');
+            }
+            $user = $em->getReference('ZikulaUsersModule:UserEntity', $uid);
+            $this->blameableListener->setUserValue($user);
+        } catch (\Exception $e) {
+            // silently fail - likely installing and tables not available
+        }
     }
 
     /**