diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index b74211f04d..8cd2c69d45 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -254,7 +254,6 @@ $template->assign_vars(array( "ACTIVATION_ADMIN_CHECKED" => $activation_admin, "CONFIRM_ENABLE" => $confirm_yes, "CONFIRM_DISABLE" => $confirm_no, - "ACTIVATION_NONE_CHECKED" => $activation_none, "BOARD_EMAIL_FORM_ENABLE" => $board_email_form_yes, "BOARD_EMAIL_FORM_DISABLE" => $board_email_form_no, "MAX_POLL_OPTIONS" => $new['max_poll_options'], diff --git a/phpBB/admin/admin_disallow.php b/phpBB/admin/admin_disallow.php index 54871098db..7518d77f1a 100644 --- a/phpBB/admin/admin_disallow.php +++ b/phpBB/admin/admin_disallow.php @@ -45,7 +45,7 @@ if( isset($HTTP_POST_VARS['add_name']) ) if ($disallowed_user == '') { - message_die(MESSAGE, $lang['Fields_empty']); + message_die(GENERAL_MESSAGE, $lang['Fields_empty']); } if( !validate_username($disallowed_user) ) { diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php index 19511c22bb..a62a534d4c 100644 --- a/phpBB/admin/admin_smilies.php +++ b/phpBB/admin/admin_smilies.php @@ -410,7 +410,7 @@ else if ( $mode != "" ) // If no code was entered complain ... if ($smile_code == '' || $smile_url == '') { - message_die(MESSAGE, $lang['Fields_empty']); + message_die(GENERAL_MESSAGE, $lang['Fields_empty']); } // @@ -454,7 +454,7 @@ else if ( $mode != "" ) // If no code was entered complain ... if ($smile_code == '' || $smile_url == '') { - message_die(MESSAGE, $lang['Fields_empty']); + message_die(GENERAL_MESSAGE, $lang['Fields_empty']); } // diff --git a/phpBB/admin/admin_ug_auth.php b/phpBB/admin/admin_ug_auth.php index 5af8a96dbe..41805dcf1d 100644 --- a/phpBB/admin/admin_ug_auth.php +++ b/phpBB/admin/admin_ug_auth.php @@ -251,9 +251,10 @@ if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == 'user' && $user_id ) || ( } } - $sql = "SELECT * - FROM " . FORUMS_TABLE . " f - ORDER BY forum_order"; + $sql = 'SELECT f.* + FROM ' . FORUMS_TABLE . ' f, ' . CATEGORIES_TABLE . ' c + WHERE f.cat_id = c.cat_id + ORDER BY c.cat_order, f.forum_order'; if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, "Couldn't obtain forum information", "", __LINE__, __FILE__, $sql); @@ -831,9 +832,9 @@ else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id } } + $t_usergroup_list = $t_pending_list = ''; if( count($name) ) { - $t_usergroup_list = $t_pending_list = ''; for($i = 0; $i < count($ug_info); $i++) { $ug = ( $mode == 'user' ) ? 'group&' . POST_GROUPS_URL : 'user&' . POST_USERS_URL; @@ -848,10 +849,9 @@ else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id } } } - else - { - $t_usergroup_list = $lang['None']; - } + + $t_usergroup_list = ($t_usergroup_list == '') ? $lang['None'] : $t_usergroup_list; + $t_pending_list = ($t_pending_list == '') ? $lang['None'] : $t_pending_list; $s_column_span = 2; // Two columns always present if( !$adv ) diff --git a/phpBB/admin/page_footer_admin.php b/phpBB/admin/page_footer_admin.php index b457d1a294..48308254aa 100644 --- a/phpBB/admin/page_footer_admin.php +++ b/phpBB/admin/page_footer_admin.php @@ -25,6 +25,8 @@ if ( !defined('IN_PHPBB') ) die("Hacking attempt"); } +global $do_gzip_compress; + // // Show the overall footer. // diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ae29cf1ac4..fd560eaa96 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -62,7 +62,32 @@ p,ul,td {font-size:10pt;}

This is a non-exhaustive (but still near complete) changelog for phpBB 2.0.x including beta and release candidate versions. Our thanks to all those people who've contributed bug reports and code fixes.

-

l.i. Changes since 2.0.16

+

l.i. Changes since 2.0.17

+ +