fix wsod on discussions page

AU-Landing-Project · Oct 23, 2015 · d23d46d · d23d46d
1 parent 9d5258a
commit d23d46d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,9 @@
 
 x.x:
 
+2.0.1 (10/22/2015):
+ - fix for discussions wsod
+
 2.0.0 (10/22/2015):
  - Upgrade for Elgg 1.9+
  - restore auto subscription option that somehow got lost...

diff --git a/manifest.xml b/manifest.xml
@@ -3,7 +3,7 @@
     <name>Comment Tracker</name>
     <author>Matt Beckett</author>
     <id>comment_tracker</id>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <description>Manage notifications/subscriptions for comment threads</description>
     <website>http://mattbeckett.me/</website>
     <copyright>(C) Matt Beckett 2015</copyright>

diff --git a/views/default/comment_tracker/manage_subscription.php b/views/default/comment_tracker/manage_subscription.php
@@ -4,6 +4,14 @@
  */
 $entity = $vars['entity'];
 
+if (!$entity && $vars['topic']) {
+	$entity = $vars['topic'];
+}
+
+if (!elgg_instanceof($entity)) {
+	return;
+}
+
 if (elgg_instanceof($entity, 'object', 'groupforumtopic') && $entity->status == 'closed') {
   return;
 }