From cf4434598dedcd4e191313cf127b18729248abec Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Tue, 28 Jun 2005 16:08:10 +0000 Subject: [PATCH] fix parameter order --- include/admin/installer.inc.php | 6 +++--- include/functions_config.inc.php | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php index d770b1e..76e9dfd 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_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 ' ' . DONE . '
'; diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php index ba9455f..0a0ce24 100644 --- 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']); } } } -- 2.39.5