fix: handle exceptions when using /0 as a URL

silverstripe · Jan 23, 2023 · eba3389 · eba3389
1 parent 9907209
commit eba3389
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/code/Controllers/ModelAsController.php b/code/Controllers/ModelAsController.php
@@ -118,8 +118,9 @@ public function handleRequest(HTTPRequest $request)
     public function getNestedController()
     {
         $request = $this->getRequest();
+        $urlSegment = $request->param('URLSegment');
 
-        if (!$URLSegment = $request->param('URLSegment')) {
+        if ($urlSegment === null || $urlSegment === '') {
             throw new Exception('ModelAsController->getNestedController(): was not passed a URLSegment value.');
         }
 
@@ -130,13 +131,14 @@ public function getNestedController()
 
         // url encode unless it's multibyte (already pre-encoded in the database)
         $filter = URLSegmentFilter::create();
+
         if (!$filter->getAllowMultibyte()) {
-            $URLSegment = rawurlencode($URLSegment ?? '');
+            $urlSegment = rawurlencode($urlSegment ?? '');
         }
 
         // Select child page
         $tableName = DataObject::singleton(SiteTree::class)->baseTable();
-        $conditions = [sprintf('"%s"."URLSegment"', $tableName) => $URLSegment];
+        $conditions = [sprintf('"%s"."URLSegment"', $tableName) => $urlSegment];
         if (SiteTree::config()->get('nested_urls')) {
             $conditions[] = [sprintf('"%s"."ParentID"', $tableName) => 0];
         }