diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-12-13 16:35:55 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-12-13 16:35:55 +0100 |
| commit | adfa1656fb9d8b5bb601af1d7a6720884954d87a (patch) | |
| tree | abcd16b98d59f11c4362bafe23fbb9c15ae1ed72 /phpBB/includes/message_parser.php | |
| parent | bd579c837490a52cb5b8ce9493e2f066bfe4d8a5 (diff) | |
| parent | af5b9a96409d788733fcb1ff367e0c7fb0583702 (diff) | |
| download | forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar.gz forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar.bz2 forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar.xz forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.zip | |
Merge branch 'ticket/igorw/9556' into develop
* ticket/igorw/9556:
[ticket/9556] Drop php closing tags, add trailing newline
Conflicts:
phpBB/includes/constants.php
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 12d8789b59..6d33723292 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1687,5 +1687,3 @@ class parse_message extends bbcode_firstpass $poll['poll_max_options'] = ($poll['poll_max_options'] < 1) ? 1 : (($poll['poll_max_options'] > $config['max_poll_options']) ? $config['max_poll_options'] : $poll['poll_max_options']); } } - -?>
\ No newline at end of file |