* Fix a bug in the serendipity_currentURL function when Serendipity is installed...

diff --git a/docs/NEWS b/docs/NEWS
index e65a72daee5a727e7fff445deefa4acacd79d82c..ebb8d5660e76ce5033de5013ab7abc40235c1cbe 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,11 @@
 Version 0.9.1 ()
 ------------------------------------------------------------------------
 
+    * Fix a bug in the serendipity_currentURL function when Serendipity
+      is installed in your HTTP root. This bug only effects the plugins karma,
+      entrysplit and multilingual on these installations.
+      Thanks to Richard Davey for spotting this! (garvinhicking)
+                      
     * Fix showing preview image of hotlinked images. Thanks to Thomas
       and RobA from the forums! (garvinhicking)
 

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