4 files changed, 16 insertions, 11 deletions
diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index 43a30d70..bd336cda 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -27,14 +27,16 @@ class comment_event_Core {
 
   static function user_deleted($user) {
     $guest = identity::guest();
-    db::build()
-      ->update("comments")
-      ->set("author_id", $guest->id)
-      ->set("guest_email", null)
-      ->set("guest_name", "guest")
-      ->set("guest_url", null)
-      ->where("author_id", "=", $user->id)
-      ->execute();
+    if (!empty($guest)) {          // could be empty if there is not identity provider
+      db::build()
+        ->update("comments")
+        ->set("author_id", $guest->id)
+        ->set("guest_email", null)
+        ->set("guest_name", "guest")
+        ->set("guest_url", null)
+        ->where("author_id", "=", $user->id)
+        ->execute();
+    }
   }
 
   static function identity_provider_changed($old_provider, $new_provider) {
diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index d9776def..99f72a30 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -8,8 +8,9 @@
          width="32"
          height="32" />
     <?= gallery::date_time($comment->created) ?>
-    <?= t('<a href="#">%author_name</a> said <em>%comment_text</em>',
+    <?= t('<a href="%url">%author_name</a> said <em>%comment_text</em>',
           array("author_name" => html::clean($comment->author_name()),
+                "url" => user_profile::url($comment->author_id),
                 "comment_text" => text::limit_words(nl2br(html::purify($comment->text)), 50))); ?>
   </li>
   <? endforeach ?>
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index 2c485b53..c4cf1ce0 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -8,8 +8,9 @@
            width="40"
            height="40" />
     </a>
-    <?= t("on %date_time,  <a href=\"#\">%name</a> said",
+    <?= t("on %date_time,  <a href=\"%url\">%name</a> said",
           array("date_time" => gallery::date_time($comment->created),
+                "url" => user_profile::url($comment->author_id),
                 "name" => html::clean($comment->author_name()))) ?>
   </p>
   <div>
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index fc54e3d2..c8236997 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -22,8 +22,9 @@
              width="40"
              height="40" />
       </a>
-      <?= t('on %date <a href="#">%name</a> said',
+      <?= t('on %date <a href="%url">%name</a> said',
             array("date" => date("Y-M-d H:i:s", $comment->created),
+                  "url" => user_profile::url($comment->author_id),
                   "name" => html::clean($comment->author_name()))); ?>
     </p>
     <div>