Merge pull request #64 from ventrian/fix-#63-multipage

Fix issues with multipage navigation
ventrian · Feb 2, 2022 · 153d6b0 · 153d6b0
2 parents 9304d93 + a6fc49a
commit 153d6b0
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/Components/Layout/LayoutController.vb b/Components/Layout/LayoutController.vb
@@ -1487,6 +1487,10 @@ Namespace Ventrian.NewsArticles
                                     iPtr = iPtr + 1
                                 End While
                             Else
+                                If (IsNumeric(Request("PageID"))) Then
+                                    _pageId = Convert.ToInt32(Request("PageID"))
+                                End If
+
                                 If (_pageId = Null.NullInteger) Then
                                     _pageId = Pages(objArticle.ArticleID)(0).PageID
                                 End If
@@ -1576,6 +1580,10 @@ Namespace Ventrian.NewsArticles
                                     iPtr = iPtr + 1
                                 End While
                             Else
+                                If (IsNumeric(Request("PageID"))) Then
+                                    _pageId = Convert.ToInt32(Request("PageID"))
+                                End If
+
                                 If (_pageId = Null.NullInteger) Then
                                     _pageId = Pages(objArticle.ArticleID)(0).PageID
                                 End If
@@ -2101,6 +2109,10 @@ Namespace Ventrian.NewsArticles
                             If (Pages(objArticle.ArticleID).Count <= 1) Then
                                 objLink.Enabled = False
                             Else
+                                If (IsNumeric(Request("PageID"))) Then
+                                    _pageId = Convert.ToInt32(Request("PageID"))
+                                End If
+
                                 If (_pageId = Null.NullInteger) Then
                                     _pageId = CType(Pages(objArticle.ArticleID)(0), PageInfo).PageID
                                 End If
@@ -2130,6 +2142,10 @@ Namespace Ventrian.NewsArticles
                             If (Pages(objArticle.ArticleID).Count <= 1) Then
                                 objLink.Enabled = False
                             Else
+                                If (IsNumeric(Request("PageID"))) Then
+                                    _pageId = Convert.ToInt32(Request("PageID"))
+                                End If
+
                                 If (_pageId = Null.NullInteger) Then
                                     _pageId = CType(Pages(objArticle.ArticleID)(0), PageInfo).PageID
                                 End If