From: garvinhicking <garvinhicking>
Date: Mon, 24 Oct 2005 17:29:05 +0000 (+0000)
Subject: Fixes from Boris from the forums:
X-Git-Tag: 0.9~29
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=bf2cac017058a70eb49886f953f09e6c81f35829;p=s9y.git

Fixes from Boris from the forums:
The first bug is located in include/plugin_internal.inc.php:
in the long switch-statement is a duplicate Entry for show_atom0.3 and none for show_atom1.0 with the result, that there's no Atom 1.0-Option in the configuration.

Second: The function serendipity_makeFilename in include/functions_permalinks.inc.php is not utf-8 ready. I always helped myself converting it manually in 0.8x, but now s9y supports utf-8 this function should do this too. Smile
If not, all those special chars are not converted, but striped from the URLs.
---

diff --git a/docs/NEWS b/docs/NEWS
index 43dfa75..a4ee734 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,13 @@
 Version 0.9-beta4 ()
 ------------------------------------------------------------------------
 
+    * Make serendipity_makeFilename function be UTF-8 aware.
+
+    * Fix syndication plugin not allowing to configure Atom 1.0 feed.
+      Thanks to Boris from the forums!
+
+    * Fix an issue of privilege escalation for non-admins (garvinhicking)
+    
     * Fix a parse error in the Importer, introduced in beta3
       (garvinhicking)
 
diff --git a/include/functions_permalinks.inc.php b/include/functions_permalinks.inc.php
index e37bf94..8c65e2b 100644
--- a/include/functions_permalinks.inc.php
+++ b/include/functions_permalinks.inc.php
@@ -89,6 +89,12 @@ function serendipity_makeFilename($str) {
 
                      'y');
 
+    if (LANG_CHARSET == 'UTF-8') {
+        // URLs need to be 7bit - since this function takes care of the most common ISO-8859-1
+        // characters, try to UTF8-decode the string first.
+        $str = utf8_decode($str);
+    }
+
     if (isset($GLOBALS['i18n_filename_from'])) {
         // Replace international chars not detected by every locale.
         // The array of chars is defined in the language file.
diff --git a/include/plugin_internal.inc.php b/include/plugin_internal.inc.php
index 5fd483c..5281f6d 100644
--- a/include/plugin_internal.inc.php
+++ b/include/plugin_internal.inc.php
@@ -645,7 +645,7 @@ class serendipity_syndication_plugin extends serendipity_plugin {
                 $propbag->add('default',     'false');
                 break;
 
-            case 'show_atom0.3':
+            case 'show_atom1.0':
                 $propbag->add('type',        'boolean');
                 $propbag->add('name',        SYNDICATION_PLUGIN_ATOM10);
                 $propbag->add('description', '');