diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:36 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:36 +0100 |
| commit | 1ceddd9eeccde56ab307631a16e40b943eac883a (patch) | |
| tree | d1045042f004c0d551658e8192b75965139f3707 /phpBB/posting.php | |
| parent | 0e0c8d78199cfa2dd56a62266df33655c93367ff (diff) | |
| parent | aadda939732ee163c3babedf4afcd914af12a2cc (diff) | |
| download | forums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar forums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar.gz forums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar.bz2 forums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar.xz forums-1ceddd9eeccde56ab307631a16e40b943eac883a.zip | |
Merge commit 'release-3.0-RC3'
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 675b390672..403eea5418 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -164,6 +164,10 @@ if ($post_data['forum_password']) } // Check permissions +if ($user->data['is_bot']) +{ + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); +} // Is the user able to read within this forum? if (!$auth->acl_get('f_read', $forum_id)) @@ -716,7 +720,7 @@ if ($submit || $preview || $refresh) } // Validate username - if (($post_data['username'] && !$user->data['is_registered']) || ($mode == 'edit' && $post_data['username'] && $post_data['post_username'] && $post_data['post_username'] != $post_data['username'])) + if (($post_data['username'] && !$user->data['is_registered']) || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS && $post_data['username'] && $post_data['post_username'] && $post_data['post_username'] != $post_data['username'])) { include($phpbb_root_path . 'includes/functions_user.' . $phpEx); @@ -977,6 +981,7 @@ if ($submit || $preview || $refresh) if ($mode == 'edit') { $data['topic_replies_real'] = $post_data['topic_replies_real']; + $data['topic_replies'] = $post_data['topic_replies']; } unset($message_parser); @@ -989,6 +994,7 @@ if ($submit || $preview || $refresh) { meta_refresh(10, $redirect_url); $message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD']; + $message .= (($user->data['user_id'] == ANONYMOUS) ? '' : $user->lang['POST_APPROVAL_NOTIFY']); } else { |