diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-03 19:56:19 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-03 19:56:19 +0200 |
| commit | 0ed69d91b2ec7b4b2e86acbc1a9d65b09cad71c1 (patch) | |
| tree | f56d4518ec990febb9faa480ec436df46baec10f /phpBB/includes/message_parser.php | |
| parent | 0ba247ef0f984ecb088f2b8ce0e114f5b48de6d5 (diff) | |
| parent | 91399fd3571fc2fe95eb680564cad6103adadf59 (diff) | |
| download | forums-0ed69d91b2ec7b4b2e86acbc1a9d65b09cad71c1.tar forums-0ed69d91b2ec7b4b2e86acbc1a9d65b09cad71c1.tar.gz forums-0ed69d91b2ec7b4b2e86acbc1a9d65b09cad71c1.tar.bz2 forums-0ed69d91b2ec7b4b2e86acbc1a9d65b09cad71c1.tar.xz forums-0ed69d91b2ec7b4b2e86acbc1a9d65b09cad71c1.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9582] MSSQL native backups can now be restored.
[ticket/9582] Advanced search cannot be accessed using MSSQL native.
[ticket/9582] Removing a report reason leaves reports with an unknown reason under MSSQL native.
[ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver.
[ticket/9582] Custom profile fields cannot be created under MSSQL native.
[ticket/9520] Additionally filter requests for {common,config}.php
[ticket/9520] New web.config file as suggested by Microsoft using request filter
[ticket/9520] Removed per directory web.config files.
[ticket/9520] Add suggested web.config for root files as suggested by Microsoft.
[ticket/9520] Add some default web.config files for IIS.
[develop-olympus] Basic gitignore file for cache files and backups.
[ticket/9170] Unable to get image size in img bbcode when URL has multiple parameters.
[feature/webpi] Validate inline with MSSQL password policy.
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 50aad8588a..952b55cc8c 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -300,7 +300,7 @@ class bbcode_firstpass extends bbcode if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width']) { - $stats = @getimagesize($in); + $stats = @getimagesize(htmlspecialchars_decode($in)); if ($stats === false) { |