Fixed empty topic title issue when editing posts + moderation of locked topics

git-svn-id: file:///svn/phpbb/trunk@1583 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-12-15 14:19:29 +00:00
parent e829804aa9
commit 27a7e8a401

View file

@ -865,18 +865,6 @@ else
} }
} }
//
// Is topic or forum locked?
//
if( $forum_status == FORUM_LOCKED )
{
message_die(GENERAL_MESSAGE, $lang['Forum_locked']);
}
else if( $topic_status == TOPIC_LOCKED )
{
message_die(GENERAL_MESSAGE, $lang['Topic_locked']);
}
// //
// Set topic type // Set topic type
// //
@ -999,6 +987,18 @@ if( !$is_auth[$is_auth_type] )
// End Auth // End Auth
// //
//
// Is topic or forum locked?
//
if( $forum_status == FORUM_LOCKED && !$is_auth['auth_mod'])
{
message_die(GENERAL_MESSAGE, $lang['Forum_locked']);
}
else if( $topic_status == TOPIC_LOCKED && !$is_auth['auth_mod'])
{
message_die(GENERAL_MESSAGE, $lang['Topic_locked']);
}
// //
// Notify on reply // Notify on reply
// //
@ -1058,7 +1058,7 @@ if( $submit && $mode != "vote" )
} }
$post_subject = trim(strip_tags($HTTP_POST_VARS['subject'])); $post_subject = trim(strip_tags($HTTP_POST_VARS['subject']));
if( $mode == 'newtopic' && empty($post_subject) ) if( ( $mode == "newtopic" || $mode == "editpost" ) && empty($post_subject) )
{ {
$error = TRUE; $error = TRUE;
if( !empty($error_msg) ) if( !empty($error_msg) )