Check for null users on document view

Author: Davnit

src/libraries/Comment.php

@@ -219,8 +219,7 @@ public function getParentType() {
   }
 
   public function getUser() {
-    if (is_null($this->user_id)) return null;
-    return new User($this->user_id);
+    return User::findUserById($this->user_id);
   }
 
   public function getUserId() {

src/templates/Document/View.phtml

@@ -32,10 +32,7 @@ if ($object) {
     $object->getContent(true), FILTER_SANITIZE_STRING
   )), "\n", 300);
 
-  $user_name   = $object->getUser()->getName();
-  $user_id     = $object->getUserId();
-  $user_url    = $object->getUser()->getURI();
-  $user_avatar = $object->getUser()->getAvatarURI(22);
+  $user = $object->getUser();
 
 }
 
@@ -73,8 +70,8 @@ require("./header.inc.phtml");
 <?php } else { ?>
           <span class="float-right"><time datetime="<?php echo $object->getCreatedDateTime()->format('c'); ?>"><?php echo $object->getCreatedDateTime()->format("l, F j, Y"); ?></time></span>
 <?php } ?>
-<?php if ($user_id !== null) { ?>
-          <span><a href="<?php echo $user_url; ?>"><img class="avatar" src="<?php echo $user_avatar; ?>"/> <?php echo filter_var($user_name, FILTER_SANITIZE_STRING); ?></a></span>
+<?php if ($user !== null) { ?>
+          <span><a href="<?php echo $user->getURI(); ?>"><img class="avatar" src="<?php echo $user->getAvatarURI(22); ?>"/> <?php echo filter_var($user->getName(), FILTER_SANITIZE_STRING); ?></a></span>
 <?php } ?>
         </footer>
       </article>
@@ -91,15 +88,12 @@ $c_delete_visible_master = ($logged_in && ($logged_in->getOptionsBitmask() & Use
 <?php foreach ($comments as $c) {
         $c_id          = $c->getId();
         $c_user        = $c->getUser();
-        $c_user_name   = $c_user->getName();
         $c_user_id     = $c->getUserId();
-        $c_user_url    = $c_user->getURI();
-        $c_user_avatar = $c_user->getAvatarURI(22);
 
         $c_edit_visible = ($c_user_id == $logged_in_id || $c_edit_visible_master);
         $c_delete_visible = ($c_user_id == $logged_in_id || $c_delete_visible_master);
 ?>
-            <tr><td><a href="<?php echo $c_user_url; ?>"><img class="avatar" src="<?php echo $c_user_avatar; ?>"/> <?php echo filter_var($c_user_name, FILTER_SANITIZE_STRING); ?></a><br/><time class="comment_timestamp" datetime="<?php echo $c->getCreatedDateTime()->format("c"); ?>"><?php echo $c->getCreatedDateTime()->format("D M j, Y g:ia T"); ?></time><?php if ($c_delete_visible) { ?><a class="button comment_button" href="<?php echo Common::relativeUrlToAbsolute("/comment/delete?id=" . urlencode($c_id)); ?>">Delete</a><?php } if ($c_edit_visible) { ?><a class="button comment_button" href="<?php echo Common::relativeUrlToAbsolute("/comment/edit?id=" . urlencode($c_id)); ?>">Edit</a><?php } ?></td><td><?php echo $c->getContent(true); ?></td></tr>
+            <tr><td><?php if ($c_user) { ?><a href="<?php echo $c_user->getURI(); ?>"><img class="avatar" src="<?php echo $c_user->getAvatarURI(22); ?>"/> <?php echo filter_var($c_user->getName(), FILTER_SANITIZE_STRING); ?></a><?php } else { ?>Anonymous<?php } ?><br/><time class="comment_timestamp" datetime="<?php echo $c->getCreatedDateTime()->format("c"); ?>"><?php echo $c->getCreatedDateTime()->format("D M j, Y g:ia T"); ?></time><?php if ($c_delete_visible) { ?><a class="button comment_button" href="<?php echo Common::relativeUrlToAbsolute("/comment/delete?id=" . urlencode($c_id)); ?>">Delete</a><?php } if ($c_edit_visible) { ?><a class="button comment_button" href="<?php echo Common::relativeUrlToAbsolute("/comment/edit?id=" . urlencode($c_id)); ?>">Edit</a><?php } ?></td><td><?php echo $c->getContent(true); ?></td></tr>
 <?php } ?>
           </tbody></table>
 <?php } ?>