Merge pull request #29 from DNNCommunity/fix_25

Fix for issue #25

Author: juvander

branches/DNN_5/Components/Controllers/ThreadController.vb

@@ -367,6 +367,20 @@ Namespace DotNetNuke.Modules.Forum
                         sitem.TabId = moduleInfo.TabID
                         Dim cntThread As New ThreadController()
                         Dim objThread As ThreadInfo = cntThread.GetThread(thread.ThreadID)
+
+                        'This is to make sure all items have ContentItem created (upgrade issue)
+                        If objThread.ContentItemId < 1 Then
+                            Dim cntContent As New Content
+                            objThread.ModuleID = moduleInfo.ModuleID
+                            objThread.TabID = moduleInfo.TabID
+                            objThread.SitemapInclude = objThread.ContainingForum.EnableSitemap
+
+                            cntContent.CreateContentItem(objThread, moduleInfo.TabID)
+
+                            DotNetNuke.Modules.Forum.Components.Utilities.Caching.UpdateThreadCache(objThread.ThreadID)
+                            objThread = cntThread.GetThread(thread.ThreadID)
+                        End If
+
                         Dim ters As List(Of String) = GetTags(moduleInfo.Terms)
 
                         For Each Term As Entities.Content.Taxonomy.Term In objThread.Terms
@@ -385,6 +399,8 @@ Namespace DotNetNuke.Modules.Forum
             Catch ex As System.InvalidCastException
                 'There are cases when isearch does not return correctly so just catch & log
                 log.Error("Search Portal: " + moduleInfo.PortalID.ToString, ex)
+            Catch ex2 As SystemException
+                log.Error("Search Portal: " + moduleInfo.PortalID.ToString, ex2)
             End Try
             Return retval
         End Function

branches/DNN_5/Components/Controllers/UserController.vb

@@ -820,7 +820,7 @@ Namespace DotNetNuke.Modules.Forum
             Dim timeOut As Int32 = ForumUserInfoCacheTimeout * Convert.ToInt32(Entities.Host.Host.PerformanceSetting)
 
             Dim cntForumUser As New ForumUserController
-            Dim fUser As New ForumUserInfo(ModuleID)
+            Dim fUser As ForumUserInfo
             fUser = cntForumUser.UserGet(PortalID, UserID, ModuleID)
 
             '' we could not find this forum user