makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix 3 very tiny bugs... #35545, #35365 and #35305

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9041 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-11-02 11:19:12 +00:00
parent f9b2dcff66
commit 75539560e2
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/acp/acp_attachments.php
View file

@ -765,6 +765,8 @@ class acp_attachments
$s_forum_id_options = ''; $s_forum_id_options = '';
/** @todo use in-built function **/
$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
FROM ' . FORUMS_TABLE . ' FROM ' . FORUMS_TABLE . '
ORDER BY left_id ASC'; ORDER BY left_id ASC';
@ -795,7 +797,7 @@ class acp_attachments
} }
else if ($row['left_id'] > $right + 1) 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']; $right = $row['right_id'];
@ -1168,7 +1170,7 @@ class acp_attachments
$location .= '/'; $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); $imagick = str_replace('\\', '/', $location);
continue; continue;

2
phpBB/install/install_install.php
View file

@ -398,7 +398,7 @@ class install_install extends module
$location .= '/'; $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); $img_imagick = str_replace('\\', '/', $location);
continue; continue;

9
phpBB/styles/prosilver/theme/content.css
View file

@ -385,6 +385,15 @@ dd .signature {
border: none; border: none;
} }
.signature li {
list-style-type: inherit;
}
.signature ul, .signature ol {
margin-bottom: 1em;
margin-left: 3em;
}
/* Post noticies */ /* Post noticies */
.notice { .notice {
font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;