(no commit message)

diff --git a/docs/NEWS b/docs/NEWS
index d14b4ca23f05d1f88f4a8bdc9c3aa5694cc61505..69675ff97ec27e4b6b508c9299c8a3d892ee2945 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 0.9 ()
 ------------------------------------------------------------------------
 
+    * Added fix for wrong language in permission groups (were created in the
+      language that the browser of the installing user has (flotsam)
+
     * Added Voodoo Wiki/XML importer, hooks into static page plugin.
       (Tim Putnam)
 

diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php
index 129676b2c965531840fb2cc311252797e0515bb5..d770b1e7ee3ebf06e026d332ebab873d2acb43ca 100644 (file)
--- a/include/admin/installer.inc.php
+++ b/include/admin/installer.inc.php
@@ -417,9 +417,9 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
         serendipity_set_user_var('mail_comments', $mail_comments, $authorid);
         serendipity_set_user_var('mail_trackbacks', $mail_comments, $authorid);
         serendipity_set_user_var('right_publish', 1, $authorid);
-        serendipity_addDefaultGroup(USERLEVEL_EDITOR_DESC, USERLEVEL_EDITOR);
-        serendipity_addDefaultGroup(USERLEVEL_CHIEF_DESC,  USERLEVEL_CHIEF);
-        serendipity_addDefaultGroup(USERLEVEL_ADMIN_DESC,  USERLEVEL_ADMIN);
+        serendipity_addDefaultGroup(USERLEVEL_EDITOR_DESC, 'USERLEVEL_EDITOR_DESC');
+        serendipity_addDefaultGroup(USERLEVEL_CHIEF_DESC,  'USERLEVEL_CHIEF_DESC');
+        serendipity_addDefaultGroup(USERLEVEL_ADMIN_DESC,  'USERLEVEL_ADMIN_DESC');
 
         echo ' <strong>' . DONE . '</strong><br />';
 

diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 8b92cd25a06a6ddfcdb66c917345b46d7be792b9..ba9455fa3e0b62daca95fdb5b2555e046fb34f9e 100644 (file)
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -700,7 +700,16 @@ function &serendipity_getAllGroups($apply_ACL_user = false) {
                                           FROM {$serendipity['dbPrefix']}groups AS g
                                       ORDER BY  g.name", false, 'assoc');
     }
-    
+    if (is_array($groups) {
+        foreach ($groups as $k => $v) {
+            if ('USERLEVEL_' == substr($v['confvalue'], 0, 10)) {
+                $groups[$k]['confvalue'] = constant($v['confvalue']);
+            }
+            if ('USERLEVEL_' == substr($v['name'], 0, 10)) {
+                $groups[$k]['name'] = constant($v['name']);
+            }
+        }
+    }
     return $groups;
 }