diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-04-20 00:22:29 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-04-20 00:22:29 +0000 |
| commit | 5b0bba72b1c619af2f39859ec0c262f860f991ac (patch) | |
| tree | 9fb003cf223ff6bf2e26feb78a35603dff88a471 /phpBB/posting.php | |
| parent | 65aa92182826eb06830626df49ab7a0210b06718 (diff) | |
| download | forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.gz forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.bz2 forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.xz forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.zip | |
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
git-svn-id: file:///svn/phpbb/trunk@2532 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 2bdb201032..5418ff7a5d 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -82,17 +82,17 @@ if ( isset($HTTP_POST_VARS['cancel']) ) else if ( $topic_id ) { $redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"; - $post_append = ""; + $post_append = ''; } else if ( $forum_id ) { $redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"; - $post_append = ""; + $post_append = ''; } else { $redirect = "index.$phpEx"; - $post_append = ""; + $post_append = ''; } $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; @@ -442,7 +442,7 @@ else if ( $mode == 'vote' ) // if ( !empty($HTTP_POST_VARS['vote_id']) ) { - $vote_option_id = $HTTP_POST_VARS['vote_id']; + $vote_option_id = intval($HTTP_POST_VARS['vote_id']); $sql = "SELECT vd.vote_id FROM " . VOTE_DESC_TABLE . " vd, " . VOTE_RESULTS_TABLE . " vr @@ -871,7 +871,7 @@ if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] ) if( $is_auth['auth_sticky'] ) { $topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_STICKY . '"'; - if ( $post_data['topic_type'] == POST_STICKY ) + if ( $post_data['topic_type'] == POST_STICKY || $topic_type == POST_STICKY ) { $topic_type_toggle .= ' checked="checked"'; } @@ -881,7 +881,7 @@ if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] ) if( $is_auth['auth_announce'] ) { $topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_ANNOUNCE . '"'; - if ( $post_data['topic_type'] == POST_ANNOUNCE ) + if ( $post_data['topic_type'] == POST_ANNOUNCE || $topic_type == POST_ANNOUNCE ) { $topic_type_toggle .= ' checked="checked"'; } @@ -890,7 +890,7 @@ if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] ) if ( $topic_type_toggle != '' ) { - $topic_type_toggle = $lang['Post_topic_as'] . ': <input type="radio" name="topictype" value="' . POST_NORMAL .'"' . ( ( $post_data['topic_type'] == POST_NORMAL ) ? ' checked="checked"' : '' ) . ' /> ' . $lang['Post_Normal'] . ' ' . $topic_type_toggle; + $topic_type_toggle = $lang['Post_topic_as'] . ': <input type="radio" name="topictype" value="' . POST_NORMAL .'"' . ( ( $post_data['topic_type'] == POST_NORMAL || $topic_type == POST_NORMAL ) ? ' checked="checked"' : '' ) . ' /> ' . $lang['Post_Normal'] . ' ' . $topic_type_toggle; } } @@ -1082,4 +1082,4 @@ $template->pparse('body'); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -?> +?>
\ No newline at end of file |