diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-22 19:38:25 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-22 19:38:25 +0000 |
| commit | d46e8e6f98054fc58a126c865184369198d9a2ed (patch) | |
| tree | f84899714e91ff360dcf16122d0ef723f5cefa15 /phpBB/includes/acp/acp_attachments.php | |
| parent | 47b4b8346813312f99509d3f9d877c9cbf81b88b (diff) | |
| download | forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.gz forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.bz2 forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.xz forums-d46e8e6f98054fc58a126c865184369198d9a2ed.zip | |
merge revisions i missed... hopefully not breaking things - did not check every change.
git-svn-id: file:///svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_attachments.php')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 3b53d51417..7b866e3c36 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -768,6 +768,8 @@ class acp_attachments $s_forum_id_options = ''; + /** @todo use in-built function **/ + $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id FROM ' . FORUMS_TABLE . ' ORDER BY left_id ASC'; @@ -798,7 +800,7 @@ class acp_attachments } else if ($row['left_id'] > $right + 1) { - $padding = $padding_store[$row['parent_id']]; + $padding = empty($padding_store[$row['parent_id']]) ? '' : $padding_store[$row['parent_id']]; } $right = $row['right_id']; @@ -1171,7 +1173,7 @@ class acp_attachments $location .= '/'; } - if (@is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000) + if (@file_exists($location) && @is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000) { $imagick = str_replace('\\', '/', $location); continue; |