From 280b9db44fd8c7b68a256ad409a05d73918fbff2 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 6 Feb 2012 23:07:41 +0000
Subject: [PATCH] Move the wp_enqueue_style() to header.php. see #19978.

git-svn-id: http://svn.automattic.com/wordpress/trunk@19845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentytwelve/functions.php | 13 -------------
 wp-content/themes/twentytwelve/header.php    |  7 ++++++-
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
index f0de02969..b2cd93bde 100644
--- a/wp-content/themes/twentytwelve/functions.php
+++ b/wp-content/themes/twentytwelve/functions.php
@@ -67,19 +67,6 @@ function twentytwelve_setup() {
 }
 endif;
 
-/**
- * Enqueues the theme's stylesheet.
- *
- * The wp_enqueue_scripts hook is meant for both styles and scripts, and only
- * fires on the frontend.
- *
- * @since Twenty Twelve 1.0
- */
-function twentytwelve_enqueue_scripts() {
-	wp_enqueue_style( 'twentytwelve-style', get_bloginfo( 'stylesheet_url' ) );
-}
-add_action( 'wp_enqueue_scripts', 'twentytwelve_enqueue_scripts' );
-
 /**
  * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
  *
diff --git a/wp-content/themes/twentytwelve/header.php b/wp-content/themes/twentytwelve/header.php
index 42e0ff61b..41d9056e7 100644
--- a/wp-content/themes/twentytwelve/header.php
+++ b/wp-content/themes/twentytwelve/header.php
@@ -23,7 +23,12 @@
 <!--[if lt IE 9]>
 <script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
 <![endif]-->
-<?php if ( is_singular() && get_option( 'thread_comments' ) ) wp_enqueue_script( 'comment-reply' ); ?>
+<?php
+if ( is_singular() && get_option( 'thread_comments' ) )
+	wp_enqueue_script( 'comment-reply' );
+
+wp_enqueue_style( 'twentytwelve-style', get_bloginfo( 'stylesheet_url' ) );
+?>
 <?php wp_head(); ?>
 </head>