diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-02 11:19:12 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-02 11:19:12 +0000 |
| commit | 75539560e20ac6610d04faa7d4e21b06ee99b206 (patch) | |
| tree | 590c4b1c1d18cd08d3aab92aac752214886cc123 | |
| parent | f9b2dcff66d88dfe9237aaa7147e622a2991606d (diff) | |
| download | forums-75539560e20ac6610d04faa7d4e21b06ee99b206.tar forums-75539560e20ac6610d04faa7d4e21b06ee99b206.tar.gz forums-75539560e20ac6610d04faa7d4e21b06ee99b206.tar.bz2 forums-75539560e20ac6610d04faa7d4e21b06ee99b206.tar.xz forums-75539560e20ac6610d04faa7d4e21b06ee99b206.zip | |
fix 3 very tiny bugs... #35545, #35365 and #35305
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9041 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 6 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/content.css | 9 |
3 files changed, 14 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 66d857a3df..15e9e6ab62 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -765,6 +765,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'; @@ -795,7 +797,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']; @@ -1168,7 +1170,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; diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 7f5339a6ea..8591446fea 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -398,7 +398,7 @@ class install_install extends module $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) { $img_imagick = str_replace('\\', '/', $location); continue; diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 936b53f78a..00342604bb 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -385,6 +385,15 @@ dd .signature { border: none; } +.signature li { + list-style-type: inherit; +} + +.signature ul, .signature ol { + margin-bottom: 1em; + margin-left: 3em; +} + /* Post noticies */ .notice { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; |