diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-10-17 21:47:04 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-10-17 21:47:04 +0200 |
| commit | d753a02ec02e9475ee29d12797648c3aecccdcd8 (patch) | |
| tree | c418ddf592f762c842db7a97b26d7de93a2aa85f /phpBB/posting.php | |
| parent | 6e5e22961a86c168742ba20dbd7e575ce3afd1b7 (diff) | |
| parent | 642f940bc82bd426dfcc27d5d13ff6296c2f7fe6 (diff) | |
| download | forums-d753a02ec02e9475ee29d12797648c3aecccdcd8.tar forums-d753a02ec02e9475ee29d12797648c3aecccdcd8.tar.gz forums-d753a02ec02e9475ee29d12797648c3aecccdcd8.tar.bz2 forums-d753a02ec02e9475ee29d12797648c3aecccdcd8.tar.xz forums-d753a02ec02e9475ee29d12797648c3aecccdcd8.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/7332] Fix post details expand link rendering on Webkit.
[ticket/9162] Prevent notice on unset poll title
[ticket/7417] Also focus search keywords and username in subsilver2.
[ticket/7417] Focus username field when prosilver login page is loaded.
[ticket/7417] Focus search keywords field when prosilver search page is loaded.
[ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft".
[ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".
[ticket/7538] Limit user_login_attempts to prevent SQL errors.
[ticket/9848] Add avatars, attachments and store files to .gitignore.
[ticket/9822] Correct some style related ACP explain statements.
[ticket/9698] Add .htaccess to the includes subdirectory.
[ticket/9830] Redirect to install directly when config.php does not exist.
[ticket/9816] Remove config.php from repository
[ticket/9810] Hide "Select All" of code bbcode on print page
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 86e953680a..73ff836f01 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1300,7 +1300,7 @@ $attachment_data = $message_parser->attachment_data; $filename_data = $message_parser->filename_data; $post_data['post_text'] = $message_parser->message; -if (sizeof($post_data['poll_options']) || $post_data['poll_title']) +if (sizeof($post_data['poll_options']) || !empty($post_data['poll_title'])) { $message_parser->message = $post_data['poll_title']; $message_parser->bbcode_uid = $post_data['bbcode_uid']; |