aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-12-15 14:19:29 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-12-15 14:19:29 +0000
commit27a7e8a401f6f8ea7b7d5fe6db502cdaee31ed09 (patch)
treede6618a1e71994d46910d51d42f4039e67462abd
parente829804aa943515371b34cf524083b223a72a840 (diff)
downloadforums-27a7e8a401f6f8ea7b7d5fe6db502cdaee31ed09.tar
forums-27a7e8a401f6f8ea7b7d5fe6db502cdaee31ed09.tar.gz
forums-27a7e8a401f6f8ea7b7d5fe6db502cdaee31ed09.tar.bz2
forums-27a7e8a401f6f8ea7b7d5fe6db502cdaee31ed09.tar.xz
forums-27a7e8a401f6f8ea7b7d5fe6db502cdaee31ed09.zip
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
-rw-r--r--phpBB/posting.php26
1 files changed, 13 insertions, 13 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 604b14e98a..3cafe88871 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -866,18 +866,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
//
if( isset($HTTP_POST_VARS['topictype']) )
@@ -999,6 +987,18 @@ if( !$is_auth[$is_auth_type] )
// 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
//
@@ -1058,7 +1058,7 @@ if( $submit && $mode != "vote" )
}
$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;
if( !empty($error_msg) )