mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
2.0.18 changes
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@5283 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -59,11 +59,13 @@ while( list($var, $param) = @each($params) )
|
||||
}
|
||||
|
||||
$refresh = $preview || $poll_add || $poll_edit || $poll_delete;
|
||||
$orig_word = $replacement_word = array();
|
||||
|
||||
//
|
||||
// Set topic type
|
||||
//
|
||||
$topic_type = ( !empty($HTTP_POST_VARS['topictype']) ) ? intval($HTTP_POST_VARS['topictype']) : POST_NORMAL;
|
||||
$topic_type = ( in_array($topic_type, array(POST_NORMAL, POST_STICKY, POST_ANNOUNCE)) ) ? $topic_type : POST_NORMAL;
|
||||
|
||||
//
|
||||
// If the mode is set to topic review then output
|
||||
@@ -189,7 +191,7 @@ switch ( $mode )
|
||||
message_die(GENERAL_MESSAGE, $lang['No_topic_id']);
|
||||
}
|
||||
|
||||
$sql = "SELECT f.*, t.topic_status, t.topic_title
|
||||
$sql = "SELECT f.*, t.topic_status, t.topic_title, t.topic_type
|
||||
FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t
|
||||
WHERE t.topic_id = $topic_id
|
||||
AND f.forum_id = t.forum_id";
|
||||
@@ -312,6 +314,10 @@ if ( $result = $db->sql_query($sql) )
|
||||
{
|
||||
$topic_id = $post_info['topic_id'];
|
||||
}
|
||||
if ( $mode == 'newtopic' )
|
||||
{
|
||||
$post_data['topic_type'] = POST_NORMAL;
|
||||
}
|
||||
|
||||
$post_data['first_post'] = ( $mode == 'newtopic' ) ? true : 0;
|
||||
$post_data['last_post'] = false;
|
||||
|
Reference in New Issue
Block a user