From 10335a87889a4b08eee3ca3ef8cfd8271ae5bf91 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sun, 2 Aug 2015 12:07:41 +0200
Subject: [PATCH] Some more error fixing after noticing them in the logs

---
 .../MacroPartials/Forum/ForumActions.cshtml   |  7 ++++--
 .../MacroPartials/Forum/TopicActions.cshtml   | 22 +++++++++++--------
 OurUmbraco.Site/masterpages/Events.master     |  1 -
 OurUmbraco.Site/xslt/Project-Tags.xslt        |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/OurUmbraco.Site/Views/MacroPartials/Forum/ForumActions.cshtml b/OurUmbraco.Site/Views/MacroPartials/Forum/ForumActions.cshtml
index 3c20735a..243af200 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Forum/ForumActions.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Forum/ForumActions.cshtml
@@ -12,8 +12,11 @@
         }
 
         var mem = Members.GetCurrentMember();
-
-        var subscribed = NotificationsWeb.Library.Utils.IsSubscribedToForum(CurrentPage.Id, mem.Id);
+        var subscribed = false;
+        if (mem != null)
+        {
+            subscribed = NotificationsWeb.Library.Utils.IsSubscribedToForum(CurrentPage.Id, mem.Id);
+        }
 
         if (CurrentPage.Level == 4)
         {
diff --git a/OurUmbraco.Site/Views/MacroPartials/Forum/TopicActions.cshtml b/OurUmbraco.Site/Views/MacroPartials/Forum/TopicActions.cshtml
index 508c1bea..2b0b26d3 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Forum/TopicActions.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Forum/TopicActions.cshtml
@@ -7,15 +7,19 @@
 }
 
 <div class="utility-actions">
-	@if(topic != null) 
-	{
-		if (Members.IsLoggedIn())
-		{
-			var mem = Members.GetCurrentMember();
-			var subscribed = NotificationsWeb.Library.Utils.IsSubscribedToForumTopic(topic.Id, mem.Id);
-		
-			if (Members.IsAdmin())
-			{
+	@if(topic != null)
+    {
+        if (Members.IsLoggedIn())
+        {
+            var mem = Members.GetCurrentMember();
+            var subscribed = false;
+            if (mem != null)
+            {
+                subscribed = NotificationsWeb.Library.Utils.IsSubscribedToForumTopic(topic.Id, mem.Id);
+            }
+
+            if (Members.IsAdmin())
+            {
 				<a href="#" class="delete-thread button" data-id="@topic.Id">
 					<i class="icon-Delete-key"></i><span>Delete thread</span>
 				</a>
diff --git a/OurUmbraco.Site/masterpages/Events.master b/OurUmbraco.Site/masterpages/Events.master
index c85a7c63..687cd5bc 100644
--- a/OurUmbraco.Site/masterpages/Events.master
+++ b/OurUmbraco.Site/masterpages/Events.master
@@ -32,7 +32,6 @@
   </ul>
   </div>
   <div id="events">
-  <umbraco:Macro Alias="Events-ShowUpcoming" runat="server"></umbraco:Macro>
   </div>
 </asp:ContentPlaceHolder>
 </div>
diff --git a/OurUmbraco.Site/xslt/Project-Tags.xslt b/OurUmbraco.Site/xslt/Project-Tags.xslt
index d15b83ca..b172e9af 100644
--- a/OurUmbraco.Site/xslt/Project-Tags.xslt
+++ b/OurUmbraco.Site/xslt/Project-Tags.xslt
@@ -157,7 +157,7 @@ $recordsPerPage )">
   <xsl:when test="string-length($project/defaultScreenshotPath) &gt; 0">
     <div style="float:left;padding-top:15px;width:75px;height:80px;">
       <div style="padding-left:16px;">
-        <img style="width:40px;height:40px" src="/umbraco/imagegen.ashx?image={$project/defaultScreenshotPath}&amp;pad=true&amp;width=40&amp;height=40;"  alt="{$project/@nodeName}"/>
+        <img style="width:40px;height:40px" src="{$project/defaultScreenshotPath}?width=40&amp;height=40;"  alt="{$project/@nodeName}"/>
       </div>
     </div>
   </xsl:when>