diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:38 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:38 +0100 |
| commit | ee781806ebff950e9c645e80686f2d1d9b9545be (patch) | |
| tree | e01ec016af6191927fd24dbf4d180bcf22711fc5 /phpBB/includes/message_parser.php | |
| parent | 5324afeffd84810db3cac6e1d8dfec3678ab99c6 (diff) | |
| parent | e2ef99012194cd320c44ba70013988dcac96cae5 (diff) | |
| download | forums-ee781806ebff950e9c645e80686f2d1d9b9545be.tar forums-ee781806ebff950e9c645e80686f2d1d9b9545be.tar.gz forums-ee781806ebff950e9c645e80686f2d1d9b9545be.tar.bz2 forums-ee781806ebff950e9c645e80686f2d1d9b9545be.tar.xz forums-ee781806ebff950e9c645e80686f2d1d9b9545be.zip | |
Merge commit 'release-3.0.2-RC1'
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 674e13de49..6c12903999 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -346,6 +346,12 @@ class bbcode_firstpass extends bbcode $in = trim($in); $error = false; + // Do not allow 0-sizes generally being entered + if ($width <= 0 || $height <= 0) + { + return '[flash=' . $width . ',' . $height . ']' . $in . '[/flash]'; + } + // Apply the same size checks on flash files as on images if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width']) { |