From 1b3ef7516d5c6bee125bda4e955ea3452f0b5766 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 23 Apr 2016 21:40:30 +0200 Subject: [PATCH] Drop the "index" part of URLs Closes #347. Thanks @Robby- --- lib/Pico.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/Pico.php b/lib/Pico.php index 3767081..d0985dd 100644 --- a/lib/Pico.php +++ b/lib/Pico.php @@ -1387,9 +1387,18 @@ class Pico . (is_object($queryData) ? get_class($queryData) : gettype($queryData)) . ' given' ); } + + // drop "index" + if ($page === 'index') { + $page = ''; + } elseif (($pagePathLength = strrpos($page, '/')) !== false) { + if (substr($page, $pagePathLength + 1) === 'index') { + $page = substr($page, 0, $pagePathLength); + } + } + if (!empty($queryData)) { - $page = !empty($page) ? $page : 'index'; - $queryData = $this->isUrlRewritingEnabled() ? '?' . $queryData : '&' . $queryData; + $queryData = ($this->isUrlRewritingEnabled() || empty($page)) ? '?' . $queryData : '&' . $queryData; } if (empty($page)) {