diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-02-02 15:24:55 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-02-02 15:24:55 +0000 |
| commit | e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a (patch) | |
| tree | 8d2fe110a9af4b52f5766c0a64d77e35bb8b1ec9 | |
| parent | 2e5e0a7868b246427943feb096a383ccc355a344 (diff) | |
| download | forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar.gz forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar.bz2 forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar.xz forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.zip | |
merge revisions: #r8359, #r8360, #r8368
git-svn-id: file:///svn/phpbb/trunk@8369 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 5 | ||||
| -rw-r--r-- | phpBB/docs/coding-guidelines.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 12 | ||||
| -rw-r--r-- | phpBB/language/en/groups.php | 6 | ||||
| -rw-r--r-- | phpBB/memberlist.php | 3 |
5 files changed, 24 insertions, 4 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index df6ba7a958..642c6bf869 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -116,6 +116,11 @@ <li>[Fix] Prepend phpbb_root_path to ranks path for displaying ranks (Bug #19075)</li> <li>[Fix] Allow forum notifications if topic notifications are disabled but forum notifications enabled (Bug #14765)</li> <li>[Fix] Fixing realpath issues for provider returning the passed value instead of disabling it. This fixes issues with confirm boxes for those hosted on Network Solutions for example. (Bug #20435)</li> + <li>[Fix] Try to sort last active date on memberlist correctly at least on current page (Bug #18665)</li> + <li>[Fix] Handle generation of form tokens when maximum time is set to -1</li> + <li>[Fix] Correctly delete unapproved posts without deleting the topic (Bug #15120)</li> + <li>[Fix] Respect signature permissions in posting (Bug #16029)</li> + <li>[Fix] Users allowed to resign only from open and freely open groups (Bug #19355)</li> </ul> <a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3> diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 124ac74bb9..5ad2627d6e 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -1059,7 +1059,7 @@ append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp; <span class="comment"><!-- END loopname --></span> </pre></div> -<p>A bit later loops will be explained further. To not irretate you we will explain conditionals as well as other statements first.</p> +<p>A bit later loops will be explained further. To not irritate you we will explain conditionals as well as other statements first.</p> <h4>Including files</h4> <p>Something that existed in 2.0.x which no longer exists in 3.0.x is the ability to assign a template to a variable. This was used (for example) to output the jumpbox. Instead (perhaps better, perhaps not but certainly more flexible) we now have INCLUDE. This takes the simple form:</p> diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index a4fc818343..d6e7a30176 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -127,6 +127,18 @@ class ucp_groups } list(, $row) = each($row); + $sql = 'SELECT group_type + FROM ' . GROUPS_TABLE . ' + WHERE group_id = ' . $group_id; + $result = $db->sql_query($sql); + $group_type = (int) $db->sql_fetchfield('group_type'); + $db->sql_freeresult($result); + + if ($group_type != GROUP_OPEN && $group_type != GROUP_FREE) + { + trigger_error($user->lang['CANNOT_RESIGN_GROUP'] . $return_page); + } + if (confirm_box(true)) { group_user_del($group_id, $user->data['user_id']); diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php index 7cee799535..9f72d4070f 100644 --- a/phpBB/language/en/groups.php +++ b/phpBB/language/en/groups.php @@ -40,8 +40,10 @@ $lang = array_merge($lang, array( 'ALREADY_IN_GROUP' => 'You are already a member of the selected group.', 'ALREADY_IN_GROUP_PENDING' => 'You already requested joining the selected group.', - 'CHANGED_DEFAULT_GROUP' => 'Successfully changed default group.', - + 'CANNOT_JOIN_GROUP' => 'You are not able to join this group. You are only able to join open and freely open groups.', + 'CANNOT_RESIGN_GROUP' => 'You are not able to resign from this group. You are only able to resign from open and freely open groups.', + 'CHANGED_DEFAULT_GROUP' => 'Successfully changed default group.', + 'GROUP_AVATAR' => 'Group avatar', 'GROUP_CHANGE_DEFAULT' => 'Are you sure you want to change your default membership to the group “%s”?', 'GROUP_CLOSED' => 'Closed', diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index afe9de2432..ca71131bc1 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1369,7 +1369,8 @@ switch ($mode) if ($sort_key == 'l') { $lesser_than = ($sort_dir == 'a') ? -1 : 1; - uasort($id_cache, create_function('$first, $second', "return (\$first['last_visit'] == \$second['last_visit']) ? 0 : ((\$first['last_visit'] < \$second['last_visit']) ? $lesser_than : ($lesser_than * -1));")); +// uasort($id_cache, create_function('$first, $second', "return (\$first['last_visit'] == \$second['last_visit']) ? 0 : ((\$first['last_visit'] < \$second['last_visit']) ? $lesser_than : ($lesser_than * -1));")); + usort($user_list, create_function('$first, $second', "global \$id_cache; return (\$id_cache[\$first]['last_visit'] == \$id_cache[\$second]['last_visit']) ? 0 : ((\$id_cache[\$first]['last_visit'] < \$id_cache[\$second]['last_visit']) ? $lesser_than : ($lesser_than * -1));")); } for ($i = 0, $end = sizeof($user_list); $i < $end; ++$i) |