From 5c5cabb3d7762f3bae80c7baa8f6d8df1f6c7412 Mon Sep 17 00:00:00 2001
From: Scott Walkinshaw <scott.walkinshaw@gmail.com>
Date: Sat, 30 Jul 2011 13:00:58 -0600
Subject: [PATCH] Child theme update: loads roots style.css THEN child theme
 style.css + some cleanup - fixes #103

---
 inc/roots-actions.php | 8 ++++++--
 inc/roots-cleanup.php | 3 +--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/inc/roots-actions.php b/inc/roots-actions.php
index b03ca66..3004590 100644
--- a/inc/roots-actions.php
+++ b/inc/roots-actions.php
@@ -73,7 +73,6 @@ function roots_get_stylesheets() {
 	global $roots_options;
 	$roots_css_framework = $roots_options['css_framework'];
 	
-	$template_uri = get_template_directory_uri();
 	$styles = '';
 
 	if ($roots_css_framework === 'blueprint') {
@@ -101,7 +100,12 @@ function roots_get_stylesheets() {
 		$styles .= "\t<link rel=\"stylesheet\" href=\"" . plugins_url(). "/gravityforms/css/forms.css\">\n";
 	}
 
-  $styles .= stylesheet_link_tag('/style.css', 1);
+  if (is_child_theme()) {
+    $styles .= stylesheet_link_tag('/style.css', 1);
+		$styles .= "\t<link rel=\"stylesheet\" href=\"" . get_stylesheet_uri(). "\">\n";
+  } else {
+    $styles .= stylesheet_link_tag('/style.css', 1);
+  }
 
 	if ($roots_css_framework === 'blueprint') {
 		$styles .= "\t<!--[if lt IE 8]>" . stylesheet_link_tag('/blueprint/ie.css', 0, false) . "<![endif]-->\n";
diff --git a/inc/roots-cleanup.php b/inc/roots-cleanup.php
index 5df1a56..84a27b2 100644
--- a/inc/roots-cleanup.php
+++ b/inc/roots-cleanup.php
@@ -1,7 +1,6 @@
 <?php
 
 $theme_name = next(explode('/themes/', get_stylesheet_directory()));
-$theme_data = get_theme_data(ABSPATH . 'wp-content/themes/' . $theme_name . '/style.css');
 
 // Rewrites DO NOT happen for child themes
 // rewrite /wp-content/themes/roots/css/ to /css/
@@ -44,7 +43,7 @@ function roots_clean_plugins($content) {
 }
 
 // only use clean urls if the theme isn't a child or an MU (Network) install
-if ((!defined('WP_ALLOW_MULTISITE') || (defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE !== true)) && $theme_data['Template'] === '') {
+if ((!defined('WP_ALLOW_MULTISITE') || (defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE !== true)) && !is_child_theme()) {
 	add_action('generate_rewrite_rules', 'roots_add_rewrites');
 	add_filter('plugins_url', 'roots_clean_plugins');
 	add_filter('bloginfo', 'roots_clean_assets');