Fix parsing listing views

joomlashack · Jul 14, 2022 · 2ab8602 · 2ab8602
1 parent c1f3ccb
commit 2ab8602
Showing 1 changed file with 8 additions and 21 deletions.
diff --git a/src/site/router.php b/src/site/router.php
@@ -91,30 +91,19 @@ public function __construct($app = null, $menu = null)
             $router->attachParseRule([$this, 'parseProcessAfter'], Router::PROCESS_AFTER);
         }
 
-        /**
-         * Allow to set custom segments for routes.
-         *
-         * @param string[] $segments
-         */
-        protected function setCustomSegments(array $segments = [])
-        {
-            $params = ComponentHelper::getParams('com_osdownloads');
-
-            // Default values
-            $default = ['files' => $params->get('route_segment_files') ?: 'files'];
-
-            $this->customSegments = array_merge($default, $segments);
-        }
-
         /**
          * Get a list of custom segments.
          *
          * @return string[]
          */
         protected function getCustomSegments(): array
         {
-            if (!isset($this->customSegments)) {
-                $this->setCustomSegments();
+            if ($this->customSegments === null) {
+                $params = ComponentHelper::getParams('com_osdownloads');
+
+                $this->customSegments = [
+                    'files' => $params->get('route_segment_files') ?: 'files'
+                ];
             }
 
             return $this->customSegments;
@@ -482,10 +471,8 @@ public function parse(&$segments)
                     break;
             }
 
-            if (
-                isset($this->customSegments['files'])
-                && $this->customSegments['files'] === $lastSegment
-            ) {
+            $listSegment = $this->getCustomSegments()['files'];
+            if ($listSegment === $lastSegment) {
                 $vars['view'] = 'downloads';
 
                 array_pop($segments);