aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-01-30 16:01:15 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-01-30 16:01:15 +0000
commit325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf (patch)
tree5d5d1e996619f25c282a0fa9e4cb42531c3f2b85 /phpBB/posting.php
parentc7821700dd36899a53b8afe9f859d7a40a23e7b4 (diff)
downloadforums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar
forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar.gz
forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar.bz2
forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar.xz
forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.zip
One commit for those fixes having a very tiny impact (mostly only whitespaces or forgotten spans, etc.)
Although i somehow mistakingly got #20445 and #15249 into it. :/ Removing s_watching_img from watch_topic_forum() function (Bug #20445) Changing order for post review if more than one post affected (Bug #15249) Language typos/fixes (Bug #20425, #15719, #15429, #14669, #13479) Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738) Tiny code fixes (Bug #20165, #20025, #19795, #14804) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8350 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
-rw-r--r--phpBB/posting.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 9ddaf52acd..8a2ece6fde 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -478,7 +478,7 @@ if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && (
$subject = utf8_normalize_nfc(request_var('subject', '', true));
$subject = (!$subject && $mode != 'post') ? $post_data['topic_title'] : $subject;
$message = utf8_normalize_nfc(request_var('message', '', true));
-
+
if ($subject && $message)
{
if (confirm_box(true))
@@ -620,7 +620,7 @@ if ($submit || $preview || $refresh)
$sql = 'DELETE FROM ' . POLL_VOTES_TABLE . "
WHERE topic_id = $topic_id";
$db->sql_query($sql);
-
+
$topic_sql = array(
'poll_title' => '',
'poll_start' => 0,
@@ -674,7 +674,7 @@ if ($submit || $preview || $refresh)
// Check checksum ... don't re-parse message if the same
$update_message = ($mode != 'edit' || $message_md5 != $post_data['post_checksum'] || $status_switch || strlen($post_data['bbcode_uid']) < BBCODE_UID_LEN) ? true : false;
-
+
// Parse message
if ($update_message)
{
@@ -1073,7 +1073,7 @@ if (!sizeof($error) && $preview)
'S_IS_MULTI_CHOICE' => ($post_data['poll_max_options'] > 1) ? true : false,
'POLL_QUESTION' => $parse_poll->message,
-
+
'L_POLL_LENGTH' => ($post_data['poll_length']) ? sprintf($user->lang['POLL_RUN_TILL'], $user->format_date($poll_end)) : '',
'L_MAX_VOTES' => ($post_data['poll_max_options'] == 1) ? $user->lang['MAX_OPTION_SELECT'] : sprintf($user->lang['MAX_OPTIONS_SELECT'], $post_data['poll_max_options']))
);
@@ -1460,7 +1460,7 @@ function handle_post_delete($forum_id, $topic_id, $post_id, &$post_data)
}
else
{
- confirm_box(false, 'DELETE_MESSAGE', $s_hidden_fields);
+ confirm_box(false, 'DELETE_POST', $s_hidden_fields);
}
}