diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-16 19:52:36 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-16 19:52:36 +0200 |
| commit | 591217a903460a81df4c19850f5d99c2e9d10b1d (patch) | |
| tree | f6c8c854cc8fca4b797f28d265c6164982f53d81 /phpBB/posting.php | |
| parent | cf8995210625b31988dd9ae98435bf183ee799e3 (diff) | |
| parent | 0bf2c3eed551e57667e1fb14d0d80e347af6fc72 (diff) | |
| download | forums-591217a903460a81df4c19850f5d99c2e9d10b1d.tar forums-591217a903460a81df4c19850f5d99c2e9d10b1d.tar.gz forums-591217a903460a81df4c19850f5d99c2e9d10b1d.tar.bz2 forums-591217a903460a81df4c19850f5d99c2e9d10b1d.tar.xz forums-591217a903460a81df4c19850f5d99c2e9d10b1d.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus: (21 commits)
[feature/notify_status] Define'd constants for notify_status
[ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
[ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
[ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
[ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
[ticket/9547] Use separate constants for display/enable active topics.
[ticket/9535] Also fix the margin in the install_update.html
[ticket/9535] Fix some more rtl margin issues.
[ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
[ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
[ticket/9510] Unable to copy permissions from and to forums you cannot see
[ticket/9510] Unable to copy permissions from and to forums you cannot see
[ticket/9545] Initial forum should display active topics by default.
[ticket/9546] Also delete bookmarks, when a topic is deleted.
[ticket/9529] Topic review is not showing all selected posts.
[ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
[ticket/9146] Fix double occurring tabindex="6" in prosilver's QR
[ticket/9119] Respect language selection on automated update.
[ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
[ticket/9567] Newly registered users group description rewording.
...
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 5f27b61aae..df063ef391 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1258,7 +1258,7 @@ if ($mode == 'quote' && !$submit && !$preview && !$refresh) $message = $quote_string . $message; $message = str_replace("\n", "\n" . $quote_string, $message); - $message_parser->message = $post_data['quote_username'] . " " . $user->lang['WROTE'] . " :\n" . $message . "\n"; + $message_parser->message = $post_data['quote_username'] . " " . $user->lang['WROTE'] . ":\n" . $message . "\n"; } } @@ -1420,7 +1420,7 @@ $template->assign_vars(array( 'S_DISPLAY_USERNAME' => (!$user->data['is_registered'] || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS)) ? true : false, 'S_SHOW_TOPIC_ICONS' => $s_topic_icons, 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id) && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - ($config['delete_time'] * 60) || !$config['delete_time'])) || $auth->acl_get('m_delete', $forum_id))) ? true : false, - 'S_BBCODE_ALLOWED' => $bbcode_status, + 'S_BBCODE_ALLOWED' => ($bbcode_status) ? 1 : 0, 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', 'S_SMILIES_ALLOWED' => $smilies_status, 'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '', |