From: Andrew Browning <ayleph@thisshitistemp.com>
Date: Wed, 2 Mar 2016 17:29:33 +0000 (-0500)
Subject: Fix #5435 - Bad comment links cause server error
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=289826dc46b0399ff993a53ac85545e5096b0dc7;p=mediagoblin.git

Fix #5435 - Bad comment links cause server error

This patch addresses an issue where a server error is caused by
entering a non-existent comment ID in a media URL.
---

diff --git a/mediagoblin/notifications/__init__.py b/mediagoblin/notifications/__init__.py
index 9d2f2b78..d554de2d 100644
--- a/mediagoblin/notifications/__init__.py
+++ b/mediagoblin/notifications/__init__.py
@@ -71,6 +71,11 @@ def mark_notification_seen(notification):
 
 def mark_comment_notification_seen(comment_id, user):
     comment = Comment.query.get(comment_id)
+
+    # If there is no comment, there is no notification
+    if comment == None:
+        return
+
     comment_gmr = GenericModelReference.query.filter_by(
         obj_pk=comment.id,
         model_type=comment.__tablename__