diff -r mantis-1.1.1/config_defaults_inc.php mantis-1.1.1-borszczuk/config_defaults_inc.php
1275a1276,1311
> 	# Parameters of the top logo. Set g_logo_top_enabled to OFF to get rid of the logo completely
> 	# logo_file can be either local file or fully qualified URL to remote image
> 	$g_logo_top_enabled		= ON;
> 	$g_logo_top_file		= 'images/mantis_logo.gif';
> 	$g_logo_top_alt			= 'Mantis Bugtracker';
> 
> 	# Set to OFF if you do not want image dimension to be specified in HTML tags
> 	$g_logo_top_size_enforce	= ON;
> 	$g_logo_top_size_width		= 242;
> 	$g_logo_top_size_height		= 102;
> 
> 	# set to OFF if you do not want image to redirect to other location when clicked
> 	$g_logo_top_url_enabled		= ON;
> 	$g_logo_top_url			= 'http://www.mantisbt.org/';
> 
> 	# position of the logo on the LOGIN page and the main page. These are HTML values of 'align'
> 	# http://www.w3.org/TR/html401/present/graphics.html#h-15.1.2
> 	# use either 'left', 'right' or 'center'
> 	$g_logo_top_main_align	= 'left';
> 	$g_logo_top_login_align	= 'center';
> 
> 	# small bottom logo (button)
> 	$g_logo_button_enabled		= ON;
> 	$g_logo_button_file		= 'images/mantis_logo_button.gif';
> 	$g_logo_button_alt		= 'Powered by Mantis Bugtracker';
> 	$g_logo_button_size_enforce	= ON;
> 	$g_logo_button_size_width	= 88;
> 	$g_logo_button_size_height	= 35;
> 	$g_logo_button_url_enabled	= ON;
> 	$g_logo_button_url		= 'http://www.mantisbt.org/';
> 
> 
> 	# favicon - "image/x-icon" - windows icon (.ico) file
> 	$g_favicon_enabled	= ON;
> 	$g_favicon_file		= 'images/favicon.ico';
> 
diff -r mantis-1.1.1/core/html_api.php mantis-1.1.1-borszczuk/core/html_api.php
115c115,119
< 		echo '<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />';
---
> 
> 		if( config_get('favicon_enabled') == ON ) {
> 			printf('<link rel="shortcut icon" href="%s" type="image/x-icon" />', config_get('favicon_file'));
> 		}
> 
310,314c314,325
< 			if ( is_page_name( 'login_page' ) ) {
< 				$t_align = 'center';
< 			} else {
< 				$t_align = 'left';
< 			}
---
> 			if( config_get('logo_top_enabled') == ON ) {
> 				if ( is_page_name( 'login_page' ) ) {
> 					$t_align = config_get('logo_top_login_align');
> 				} else {
> 					$t_align = config_get('logo_top_main_align');
> 				}
> 
> 				if( config_get('logo_top_size_enforce') == ON ) {
> 					$image_tag = sprintf('<img border="0" width="%1$d" height="%2$d" src="%3$s" alt="%4$s" title="%4$s">', config_get('logo_top_size_width'), config_get('logo_top_size_height'), config_get('logo_top_file'), config_get('logo_top_alt'));
> 				} else {
> 					 $image_tag = sprintf('<img border="0" src="%1$s" alt="%2$s" title="%2$s">', config_get('logo_top_file'), config_get('logo_top_alt'));
> 				}
316,318c327,332
< 			echo '<div align="', $t_align, '">';
< 			echo '<a href="http://www.mantisbt.org" title="Free Web Based Bug Tracker"><img border="0" width="242" height="102" alt="Mantis Bugtracker" src="images/mantis_logo.gif" /></a>';
< 			echo '</div>';
---
> 				if( config_get('logo_top_url_enabled') == ON ) {
> 					printf( '<div align="%s"><a href="%s">%s</a></div>', $t_align, config_get('logo_top_url'), $image_tag );
> 				} else {
> 					printf( '<div align="%s">%s</div>', $t_align, $image_tag );
> 				}
> 			}
470c484,504
< 		echo '<a href="http://www.mantisbt.org" title="Free Web Based Bug Tracker"><img src="images/mantis_logo_button.gif" width="88" height="35" alt="Powered by Mantis Bugtracker" border="0" /></a>';
---
> 
> 		# bottom logo (button)
> 		if( config_get('logo_button_enabled') == ON ) {
> 
> 			if( config_get('logo_button_size_enforce') == ON ) {
> 				$image_tag = sprintf('<img border="0" width="%1$d" height="%2$d" src="%3$s" alt="%4$s" title="%4$s">',
> 							config_get('logo_button_size_width'), config_get('logo_button_size_height'), config_get('logo_button_file'), config_get('logo_button_alt') );
> 			} else {
> 				$image_tag = sprintf('<img border="0" src="%1$s" alt="%2$s" title="%2$s">', config_get('logo_button_file'), config_get('logo_button_alt') );
> 			}
> 
> 			if( config_get('logo_button_url_enabled') == ON ) {
> 				printf('<a href="%s">%s</a>', config_get('logo_button_url'), $image_tag);
> 			} else {
> 				echo $image_tag;
> 			}
> 
> 		} else {
> 			echo '&nbsp;';
> 		}
>