Merge pull request #6584 from WoltLab/62-list-view-page-no-validation

Add missing validation of the page number in list & grid views

Author: dtdesign

wcfsetup/install/files/lib/system/gridView/AbstractGridView.class.php

@@ -768,6 +768,10 @@ protected function validate(): void
         if ($titleColumn === null) {
             throw new \InvalidArgumentException("Missing title column in grid view with id '{$this->getID()}'.");
         }
+
+        if ($this->getPageNo() > 1 && $this->getPageNo() > $this->countPages()) {
+            $this->setPageNo($this->countPages() ?: 1);
+        }
     }
 
     /**

wcfsetup/install/files/lib/system/listView/AbstractListView.class.php

@@ -276,6 +276,10 @@ protected function validate(): void
                 }
             }
         }
+
+        if ($this->getPageNo() > 1 && $this->getPageNo() > $this->countPages()) {
+            $this->setPageNo($this->countPages() ?: 1);
+        }
     }
 
     protected function getSqlOrderBy(): string