diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-02 16:19:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-02 16:19:35 +0000 |
| commit | 15aee8920041aeaf3c9d8893341bc5470ec63ff8 (patch) | |
| tree | 4494c33edf3c0961a93969688a9ef3e347ce1365 /phpBB/includes/functions_posting.php | |
| parent | f4b6f87641e60e8a2d746c8ac2e7b96bccf6d25d (diff) | |
| download | forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.gz forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.bz2 forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.xz forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.zip | |
fixes for search button in header - #10389, #10225, #9548
added missing colour swatch to prosilver - #8657
language changes - #10387, #10375, #10373, #10353, #10279
line-height for font size (still not ideal) - #10317
Search load setting checked in sessions.php along with limit_load and also reset if not possible to determine load - #10383
Fix editing issues - #9660
git-svn-id: file:///svn/phpbb/trunk@7451 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 333dac8b56..6274cdd394 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1478,24 +1478,22 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u case 'edit_first_post': case 'edit': - if (!$auth->acl_get('m_edit', $data['forum_id']) || $data['post_edit_reason']) - { - $sql_data[POSTS_TABLE]['sql'] = array( - 'post_edit_time' => $current_time - ); - - $sql_data[POSTS_TABLE]['stat'][] = 'post_edit_count = post_edit_count + 1'; - } - - // no break - case 'edit_last_post': case 'edit_topic': - if (($post_mode == 'edit_last_post' || $post_mode == 'edit_topic') && $data['post_edit_reason']) + // If edit reason is given always display edit info + + // If editing last post then display no edit info + // If m_edit permission then display no edit info + // If normal edit display edit info + + // Display edit info if edit reason given or user is editing his post, which is not the last within the topic. + if ($data['post_edit_reason'] || (!$auth->acl_get('m_edit', $data['forum_id']) && ($post_mode == 'edit' || $post_mode == 'edit_first_post'))) { $sql_data[POSTS_TABLE]['sql'] = array( - 'post_edit_time' => $current_time + 'post_edit_time' => $current_time, + 'post_edit_reason' => $data['post_edit_reason'], + 'post_edit_user' => (int) $data['post_edit_user'], ); $sql_data[POSTS_TABLE]['stat'][] = 'post_edit_count = post_edit_count + 1'; @@ -1517,8 +1515,6 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u 'enable_sig' => $data['enable_sig'], 'post_username' => ($username && $data['poster_id'] == ANONYMOUS) ? $username : '', 'post_subject' => $subject, - 'post_edit_reason' => $data['post_edit_reason'], - 'post_edit_user' => (int) $data['post_edit_user'], 'post_checksum' => $data['message_md5'], 'post_attachment' => (!empty($data['attachment_data'])) ? 1 : 0, 'bbcode_bitfield' => $data['bbcode_bitfield'], |