diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-23 18:22:44 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-23 18:22:44 +0000 |
| commit | ad739a358ca7b593fc5f2bfc77e2058b4ea59163 (patch) | |
| tree | 0190f40f45cf190dfc5a2a1e0053fa899c14ddce /phpBB/includes/functions_posting.php | |
| parent | 3892e7330adb2464293428e58f882f7d18fc8558 (diff) | |
| download | forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar.gz forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar.bz2 forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar.xz forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.zip | |
merge? merge.
git-svn-id: file:///svn/phpbb/trunk@8672 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index d35cb44c9c..e59ecca30a 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -360,7 +360,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage { $upload->set_disallowed_content(explode('|', $config['mime_triggers'])); } - + if (!$local) { $filedata['post_attach'] = ($upload->is_valid($form_name)) ? true : false; @@ -1340,7 +1340,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data) else if ($data['topic_first_post_id'] == $post_id) { $post_mode = 'delete_first_post'; - } + } else if ($data['topic_last_post_id'] == $post_id) { $post_mode = 'delete_last_post'; @@ -1646,7 +1646,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u // 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'))) { - $data['post_edit_reason'] = truncate_string($data['post_edit_reason'], 255, false); + $data['post_edit_reason'] = truncate_string($data['post_edit_reason'], 255, 255, false); $sql_data[POSTS_TABLE]['sql'] = array( 'post_edit_time' => $current_time, |