diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-08-21 23:35:43 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-08-21 23:35:43 +0200 |
| commit | 2e787fa836dbfdcec7864b5f143520aec3752bd0 (patch) | |
| tree | 9d5d9f166d555168d0117163d304041fbcc9f2af /phpBB/includes/functions_posting.php | |
| parent | 999f6dbc0c8d48a03756d988487341ad1cc15ee6 (diff) | |
| parent | 9731f2492f329a35b80483fa7573763b728c4f40 (diff) | |
| download | forums-2e787fa836dbfdcec7864b5f143520aec3752bd0.tar forums-2e787fa836dbfdcec7864b5f143520aec3752bd0.tar.gz forums-2e787fa836dbfdcec7864b5f143520aec3752bd0.tar.bz2 forums-2e787fa836dbfdcec7864b5f143520aec3752bd0.tar.xz forums-2e787fa836dbfdcec7864b5f143520aec3752bd0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus: (57 commits)
Revert "[ticket/7716] Data too long for column 'message_subject'"
[ticket/7716] Data too long for column 'message_subject'
[ticket/9780] Adding unit tests for gen_rand_string().
[ticket/9780] Add length check back to gen_rand_string().
[ticket/7972] Copying topics in the MCP now indexes the new topic.
[ticket/9782] Board disable radio set on when server load high
[ticket/9635] Useless parameter $data['post_time'] in function submit_post.
[ticket/9104] Safari does not display box headers correctly in the ACP.
[ticket/9777] Print error message in pre-commit hook when php is not installed.
[ticket/7716] Data too long for column 'message_subject'
[task/git-tools] Ignore git commit message comments
[task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
[task/git-tools] Vastly expanded commit-msg hook.
[task/git-tools] Beginnings of a syntax checking hook.
[task/git-tools] Append ticket identifier to commit message prior to editing.
[ticket/7332] Redirect users back to post details when performing actions.
[ticket/7332] Collapse post details content down to a maximum of 300px heigh
[ticket/9771] Remove query string parameters that have no name.
[ticket/9760] Remove unrestricted wildcards from search terms.
[ticket/9599] Reimplement phpbb_checkdnsrr() function.
...
Conflicts:
tests/template/template.php
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index f6f90575d4..5e25648eb8 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -2537,7 +2537,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u if ($mode == 'post' || $mode == 'reply' || $mode == 'quote') { // Mark this topic as posted to - markread('post', $data['forum_id'], $data['topic_id'], $data['post_time']); + markread('post', $data['forum_id'], $data['topic_id']); } // Mark this topic as read |