Merge with master

2025-10-17 06:53:15 +00:00 · 2012-01-10 10:25:02 +01:00
parent 465ded9c9f 0b27c161c5
commit ccf08e05eb
8 changed files with 174 additions and 387 deletions
--- a/lib/classes/record/preview.class.php
+++ b/lib/classes/record/preview.class.php
@@ -381,11 +381,22 @@ class record_preview extends record_adapter

      if (!isset($tab[$hour][$site][$action][$row['usr_id']]))
      {
+        $user = null;
+        
+        try
+        {
+          $user = \User_Adapter::getInstance($row['usr_id'], $appbox);
+        }
+        catch (Exception $e)
+        {
+          
+        }
+
        $tab[$hour][$site][$action][$row['usr_id']] =
                array(
                    'final' => array()
                    , 'comment' => array()
-                    , 'user' => \User_Adapter::getInstance($row['usr_id'], $appbox)
+                    , 'user' => $user
        );
      }