Strip the real unneccessary components

diff --git a/include/functions_permalinks.inc.php b/include/functions_permalinks.inc.php
index e273f5f42dbeeee32179690b6af79512e17abda5..b12284352abe7aeb673c905a8cd4a44355ec3aa6 100644 (file)
--- a/include/functions_permalinks.inc.php
+++ b/include/functions_permalinks.inc.php
@@ -688,7 +688,7 @@ function serendipity_currentURL() {
         $qst = '&' . str_replace('&', '&', $uri['query']);
     }
     $uri['path'] = preg_replace('@^' . preg_quote($serendipity['serendipityHTTPPath']) . '@i', '', $uri['path']);
-    $uri['path'] = preg_replace('@^' . preg_quote($serendipity['indexFile']) . '@i', '', $uri['path']);
+    $uri['path'] = preg_replace('@^(&)?' . preg_quote($serendipity['indexFile']) . '(&)@i', '', $uri['path']);
     $url = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?' . $uri['path'] . $qst;
     $url = str_replace(
         array(