fix parameter order

diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php
index d770b1e7ee3ebf06e026d332ebab873d2acb43ca..76e9dfd5a2569308f918ffb81f57099d977fa77c 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_DESC');
-        serendipity_addDefaultGroup(USERLEVEL_CHIEF_DESC,  'USERLEVEL_CHIEF_DESC');
-        serendipity_addDefaultGroup(USERLEVEL_ADMIN_DESC,  'USERLEVEL_ADMIN_DESC');
+        serendipity_addDefaultGroup('USERLEVEL_EDITOR_DESC', USERLEVEL_EDITOR);
+        serendipity_addDefaultGroup('USERLEVEL_CHIEF_DESC',  USERLEVEL_CHIEF);
+        serendipity_addDefaultGroup('USERLEVEL_ADMIN_DESC',  USERLEVEL_ADMIN);
 
         echo ' <strong>' . DONE . '</strong><br />';
 

diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index ba9455fa3e0b62daca95fdb5b2555e046fb34f9e..0a0ce241d30d88d1d72ca59bb4394a7b02cb2621 100644 (file)
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -703,10 +703,7 @@ function &serendipity_getAllGroups($apply_ACL_user = false) {
     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']);
+                $groups[$k]['confvalue'] = $groups[$k]['name'] = constant($v['confvalue']);
             }
         }
     }