Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / noticelistitem.php

diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php
index 2d538c6e6a9aa6f249cef1878b901acc0993df61..eefde0d4a3fad5835fba8c525861d2b777c8784a 100644 (file)
--- a/lib/noticelistitem.php
+++ b/lib/noticelistitem.php
@@ -158,6 +158,8 @@ class NoticeListItem extends Widget
                 $this->showParent();
             } catch (NoParentNoticeException $e) {
                 // no parent notice
+            } catch (InvalidUrlException $e) {
+                // parent had an invalid URL so we can't show it
             }
             if ($this->addressees) { $this->showAddressees(); }
             $this->elementEnd('div');