Revert permalink change, breaks too much.

Instead, freetag plugin was patched

diff --git a/docs/NEWS b/docs/NEWS
index 54d1f4b3d63aadb46a525560f061402252907f50..a3a08fc0b9ff29552c56e71165ded94e22af9330 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -5,8 +5,7 @@ Version 1.2 ()
 
     * Fix permalink patterns for some cases to properly detect
       pagination variables instead of interpreting search words
-      as those, and fix problems when "." appears within permalinks
-      (garvinhicking)
+      as those. (garvinhicking)
 
     * Improve performance of displaying the complete archive. Instead
       of year*months SQL queries, only one query is now used.

diff --git a/include/functions_permalinks.inc.php b/include/functions_permalinks.inc.php
index 76edcd41c1025005be38dc8b1d7fc822e97eb3ff..3bef5fc946ee231f36d0faeab48aa30a790f9f8b 100644 (file)
--- a/include/functions_permalinks.inc.php
+++ b/include/functions_permalinks.inc.php
@@ -755,7 +755,7 @@ function serendipity_getUriArguments($uri, $wildcard = false) {
 global $serendipity;
 
     /* Explode the path into sections, to later be able to check for arguments and add our own */
-    preg_match('/^'. preg_quote($serendipity['serendipityHTTPPath'], '/') . '(' . preg_quote($serendipity['indexFile'], '/') . '\?\/)?(' . ($wildcard ? '.+' : '[;,_a-z\.0-9\-*\/%\+]+') . ')/i', $uri, $_res);
+    preg_match('/^'. preg_quote($serendipity['serendipityHTTPPath'], '/') . '(' . preg_quote($serendipity['indexFile'], '/') . '\?\/)?(' . ($wildcard ? '.+' : '[;,_a-z0-9\-*\/%\+]+') . ')/i', $uri, $_res);
     if (strlen($_res[2]) != 0) {
         $args = explode('/', $_res[2]);
         if ($args[0] == 'index') {