makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/9937] Make sure feed icon only shows for FORUM_POST
  [ticket/9937] The feed icon displays on External links...which we don't want
  [ticket/9925] prosilver logo margin bug in IE 6-7-8
This commit is contained in:
Andreas Fischer 2010-12-21 22:52:28 +01:00
commit 34a1b044a1
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_display.php
View file

@ -457,7 +457,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'S_LOCKED_FORUM' => ($row['forum_status'] == ITEM_LOCKED) ? true : false, 'S_LOCKED_FORUM' => ($row['forum_status'] == ITEM_LOCKED) ? true : false,
'S_LIST_SUBFORUMS' => ($row['display_subforum_list']) ? true : false, 'S_LIST_SUBFORUMS' => ($row['display_subforum_list']) ? true : false,
'S_SUBFORUMS' => (sizeof($subforums_list)) ? true : false, 'S_SUBFORUMS' => (sizeof($subforums_list)) ? true : false,
'S_FEED_ENABLED' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options'])) ? true : false, 'S_FEED_ENABLED' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options']) && $row['forum_type'] == FORUM_POST) ? true : false,
'FORUM_ID' => $row['forum_id'], 'FORUM_ID' => $row['forum_id'],
'FORUM_NAME' => $row['forum_name'], 'FORUM_NAME' => $row['forum_name'],

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

@ -90,3 +90,12 @@ dl.icon {
* html .forumbg table.table1 { * html .forumbg table.table1 {
margin: 0 -2px 0px -1px; margin: 0 -2px 0px -1px;
} }
/* Headerbar height fix for IE7 and below */
* html #site-description p {
margin-bottom: 1.0em;
}
*:first-child+html #site-description p {
margin-bottom: 1.0em;
}