diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-04 16:07:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-04 16:07:38 +0000 |
| commit | 3a8c3971da12623aeb86c67c34fe0b962d672ad9 (patch) | |
| tree | f1110b30cc9bbe41b2b7126b172d38b7e7394cf4 /phpBB/includes/acp/acp_groups.php | |
| parent | fbef3990e74034f5cf205867a2b37e0e13a98997 (diff) | |
| download | forums-3a8c3971da12623aeb86c67c34fe0b962d672ad9.tar forums-3a8c3971da12623aeb86c67c34fe0b962d672ad9.tar.gz forums-3a8c3971da12623aeb86c67c34fe0b962d672ad9.tar.bz2 forums-3a8c3971da12623aeb86c67c34fe0b962d672ad9.tar.xz forums-3a8c3971da12623aeb86c67c34fe0b962d672ad9.zip | |
- use var_export instead of our format_array function [Bug #6748]
- fix dumb error in column naming [Bug #6750]
- Make sure to catch some special conditions for cpf translation as well as correctly removing/adding default values on language installation/removing [Bug #6752]
git-svn-id: file:///svn/phpbb/trunk@6839 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index f7b4d8fc66..669e98f32f 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -363,7 +363,7 @@ class acp_groups // Since the user only has the option to copy permissions from non leader managed groups this seems to be a good compromise. if ($group_perm_from && $action == 'add' && $auth->acl_get('a_authgroups') && $auth->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth')) { - $sql = 'SELECT group_manage_founder + $sql = 'SELECT group_founder_manage FROM ' . GROUPS_TABLE . ' WHERE group_id = ' . $group_perm_from; $result = $db->sql_query($sql); @@ -371,7 +371,7 @@ class acp_groups $db->sql_freeresult($result); // Check the group if non-founder - if ($check_row && ($user->data['user_type'] == USER_FOUNDER || $check_row['group_manage_founder'] == 0)) + if ($check_row && ($user->data['user_type'] == USER_FOUNDER || $check_row['group_founder_manage'] == 0)) { // From the mysql documentation: // Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14. |