aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-05-19 16:40:56 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-05-19 16:40:56 +0000
commit4c44eddc907f1e17a6880fdba918d6523c2f660f (patch)
tree61f3bde2129aa9d341b7b01b0ed095b3f797e140 /phpBB/includes/functions.php
parent47d3e4d9b8949d98e86373de0931e928e5ae09ef (diff)
downloadforums-4c44eddc907f1e17a6880fdba918d6523c2f660f.tar
forums-4c44eddc907f1e17a6880fdba918d6523c2f660f.tar.gz
forums-4c44eddc907f1e17a6880fdba918d6523c2f660f.tar.bz2
forums-4c44eddc907f1e17a6880fdba918d6523c2f660f.tar.xz
forums-4c44eddc907f1e17a6880fdba918d6523c2f660f.zip
we included a check for getimagesize() existance... now we again can suppress notices while running this function.
git-svn-id: file:///svn/phpbb/trunk@7646 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 8120a852d0..fee5f49cc1 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2956,7 +2956,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
{
if ($config['img_link_width'] || $config['img_link_height'])
{
- $dimension = getimagesize($filename);
+ $dimension = @getimagesize($filename);
// If the dimensions could not be determined or the image being 0x0 we display it as a link for safety purposes
if ($dimension === false || empty($dimension[0]) || empty($dimension[1]))
@@ -3053,7 +3053,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
// Macromedia Flash Files
case ATTACHMENT_CATEGORY_FLASH:
- list($width, $height) = getimagesize($filename);
+ list($width, $height) = @getimagesize($filename);
$l_downloaded_viewed = 'VIEWED_COUNT';