From: flotsam <flotsam>
Date: Tue, 28 Jun 2005 15:48:48 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 0.9~374
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ee40344d43958c1769e36012c9e40e586d96160f;p=s9y.git

---

diff --git a/docs/NEWS b/docs/NEWS
index d14b4ca..69675ff 100644
--- 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 129676b..d770b1e 100644
--- 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 8b92cd2..ba9455f 100644
--- 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;
 }