backport

diff --git a/docs/NEWS b/docs/NEWS
index 279ae24bb369c1bd2292b573ee1d1573ac725d43..10fcd1dda270e931153b4d607cde719ffb3f5e1c 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.2.1 ()
 ------------------------------------------------------------------------
 
+    * Fix proper encoding of '%' sign when used in post titles
+      (garvinhicking)
+          
     * Encode RSS feed links, Patch by Hanno Boeck
     
     * Fix spartacus filter listing showing event plugin groups in the

diff --git a/include/functions_permalinks.inc.php b/include/functions_permalinks.inc.php
index 8d07ff6c7539d49f2c5c9670cec0a02aa08a764f..ca97a35c7f7dbae0efaf152302b8798ad64df89e 100644 (file)
--- a/include/functions_permalinks.inc.php
+++ b/include/functions_permalinks.inc.php
@@ -22,6 +22,7 @@ if (defined('S9Y_FRAMEWORK_PERMALINKS')) {
 function serendipity_makeFilename($str, $stripDots = false) {
     static $from = array(
                      ' ',
+                     '%',
 
                      'Ä',
                      'ä',
@@ -65,6 +66,7 @@ function serendipity_makeFilename($str, $stripDots = false) {
 
     static $to   = array(
                      '-',
+                     '%25',
 
                      'AE',
                      'ae',