From f654e1a2e62fe445341d4e749b6bcca07b55e794 Mon Sep 17 00:00:00 2001
From: Matt Thomas <iammattthomas@git.wordpress.org>
Date: Sat, 27 Mar 2010 21:50:39 +0000
Subject: [PATCH] A compromise approach for #12542 -- Treat site-title as H1 on
 front page, unless it's a static page.

git-svn-id: https://develop.svn.wordpress.org/trunk@13846 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-content/themes/twentyten/header.php | 7 ++++++-
 wp-content/themes/twentyten/page.php   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index 3ab1e2b4d2..de4987069e 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -30,7 +30,12 @@
 	<div id="header">
 		<div id="masthead">
 			<div id="branding">
-				<div id="site-title"><span><a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div>
+				<?php if ( is_home() || is_front_page() ) { ?>
+					<h1 id="site-title"><span><a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></h1>
+				<?php } else { ?>	
+					<div id="site-title"><span><a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div>
+				<?php } ?>
+				
 				<div id="site-description"><?php bloginfo( 'description' ); ?></div>
 
 				<?php
diff --git a/wp-content/themes/twentyten/page.php b/wp-content/themes/twentyten/page.php
index 27d9c799e5..fa2799b1fe 100644
--- a/wp-content/themes/twentyten/page.php
+++ b/wp-content/themes/twentyten/page.php
@@ -6,7 +6,12 @@
 <?php the_post(); ?>
 
 				<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-					<h1 class="entry-title"><?php the_title(); ?></h1>
+					<?php if ( is_front_page() ) { ?>
+						<h2 class="entry-title"><?php the_title(); ?></h2>
+					<?php } else { ?>	
+						<h1 class="entry-title"><?php the_title(); ?></h1>
+					<?php } ?>				
+
 					<div class="entry-content">
 						<?php the_content(); ?>
 						<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>