mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 00:07:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/igorw/9556' into develop

Browse Source 
* ticket/igorw/9556:
  [ticket/9556] Drop php closing tags, add trailing newline

Conflicts:
	phpBB/includes/constants.php
This commit is contained in:
Nils Adermann
2010-12-13 16:35:55 +01:00
parent bd579c8374 af5b9a9640
commit adfa1656fb
474 changed files with 274 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/message_parser.php
View File

@@ -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']);
}
}
?>