diff options
| author | dougk_ff7 <dougk_ff7@users.sourceforge.net> | 2002-03-19 15:39:06 +0000 |
|---|---|---|
| committer | dougk_ff7 <dougk_ff7@users.sourceforge.net> | 2002-03-19 15:39:06 +0000 |
| commit | 92e1d351800b76b966be63230cc38cc260ba23a5 (patch) | |
| tree | c460d3f886cc8a809b0bdda7c68f39ff7f06a133 | |
| parent | e626b1a89311dd329bd2f350a6614fd7c776bf0e (diff) | |
| download | forums-92e1d351800b76b966be63230cc38cc260ba23a5.tar forums-92e1d351800b76b966be63230cc38cc260ba23a5.tar.gz forums-92e1d351800b76b966be63230cc38cc260ba23a5.tar.bz2 forums-92e1d351800b76b966be63230cc38cc260ba23a5.tar.xz forums-92e1d351800b76b966be63230cc38cc260ba23a5.zip | |
Here we have the pleasure of fixing bugs 526891 and 530830. Both have been tested on my local copy, and they should be ready!
git-svn-id: file:///svn/phpbb/trunk@2351 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/admin/admin_groups.php | 10 | ||||
| -rw-r--r-- | phpBB/login.php | 10 | ||||
| -rw-r--r-- | phpBB/templates/subSilver/admin/group_select_body.tpl | 2 |
3 files changed, 16 insertions, 6 deletions
diff --git a/phpBB/admin/admin_groups.php b/phpBB/admin/admin_groups.php index 1e6bed8b26..e66aa2187b 100644 --- a/phpBB/admin/admin_groups.php +++ b/phpBB/admin/admin_groups.php @@ -343,9 +343,17 @@ else "S_GROUP_SELECT" => $select_list) ); + // + // Faking the IF... ELSE statements again... + // + if( count($group_list) > 0 ) + { + $template->assign_block_vars("select_box", array()); + } + $template->pparse('body'); } include('page_footer_admin.'.$phpEx); -?>
\ No newline at end of file +?> diff --git a/phpBB/login.php b/phpBB/login.php index f0c5e0e94e..c8d7bfa65b 100644 --- a/phpBB/login.php +++ b/phpBB/login.php @@ -97,10 +97,10 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($ $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : ""; $template->assign_vars(array( - "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?$redirect") . '">') + "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">') ); - $message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?$redirect") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); + $message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?redirect=$redirect") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); message_die(GENERAL_MESSAGE, $message); } @@ -111,10 +111,10 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($ $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : ""; $template->assign_vars(array( - "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?$redirect") . '">') + "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">') ); - $message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?$redirect") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); + $message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?redirect=$redirect") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); message_die(GENERAL_MESSAGE, $message); } @@ -227,4 +227,4 @@ else } -?>
\ No newline at end of file +?> diff --git a/phpBB/templates/subSilver/admin/group_select_body.tpl b/phpBB/templates/subSilver/admin/group_select_body.tpl index e00f85e110..7428918896 100644 --- a/phpBB/templates/subSilver/admin/group_select_body.tpl +++ b/phpBB/templates/subSilver/admin/group_select_body.tpl @@ -8,9 +8,11 @@ <th class="thHead" align="center">{L_GROUP_SELECT}</th> </tr> + <!-- BEGIN select_box --> <tr> <td class="row1" align="center">{S_GROUP_SELECT} <input type="submit" name="edit" value="{L_LOOK_UP}" class="mainoption" /> </td> </tr> + <!-- END select_box --> <tr> <td class="catBottom" align="center">{S_HIDDEN_FIELDS}<input type="submit" class="liteoption" name="new" value="{L_CREATE_NEW_GROUP}" /></td> </tr> |