From a3d351cafe9a9039b89ca7fdd19e54737ec892bb Mon Sep 17 00:00:00 2001
From: Scott Walkinshaw <scott.walkinshaw@gmail.com>
Date: Mon, 25 Apr 2011 22:03:58 -0600
Subject: [PATCH 1/2] URL rewriting bug fixes + better MU support

---
 includes/roots-cleanup.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/includes/roots-cleanup.php b/includes/roots-cleanup.php
index b5107d4..025311c 100644
--- a/includes/roots-cleanup.php
+++ b/includes/roots-cleanup.php
@@ -43,12 +43,13 @@ function roots_clean_plugins($content) {
     return $content;
 }
 
-// only use clean urls if the theme isn't a child
-if ($theme_data['Template'] === '') {
+// 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'] === '') {
   add_action('generate_rewrite_rules', 'roots_add_rewrites');
   add_filter('plugins_url', 'roots_clean_plugins');
   add_filter('bloginfo', 'roots_clean_assets');
   add_filter('stylesheet_directory_uri', 'roots_clean_assets');
+  add_filter('template_directory_uri', 'roots_clean_assets');
 }
 
 // redirect /?s to /search/
@@ -73,6 +74,7 @@ function roots_root_relative_url($input) {
 add_filter('bloginfo_url', 'roots_root_relative_url');
 add_filter('theme_root_uri', 'roots_root_relative_url');
 add_filter('stylesheet_directory_uri', 'roots_root_relative_url');
+add_filter('template_directory_uri', 'roots_root_relative_url');
 add_filter('the_permalink', 'roots_root_relative_url');
 add_filter('wp_list_pages', 'roots_root_relative_url');
 add_filter('wp_list_categories', 'roots_root_relative_url');

From ad5e287ddcef524de05fc5b8b44690cb18bb958a Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Sun, 24 Apr 2011 09:55:26 -0600
Subject: [PATCH 2/2] tagging 3.2.2 (bugfixes)

---
 README.md | 33 +++++++++++++++------------------
 style.css |  2 +-
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 301a5f7..180c0e5 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,15 @@
 
 ## Changelog:
 
+### 3.2.2: April 24th, 2011
+<ul>
+	<li>Bugfixes</li>
+</ul>
+
 ### 3.2.1: April 20th, 2011
 
 <ul>
-  <li>Added support for child themes</li>
+	<li>Added support for child themes</li>
 </ul>
 
 ### 3.2.0: April 15th, 2011
@@ -15,9 +20,6 @@
 	<li>Updated the conditional comment code to match latest changes to HTML5 Boilerplate</li>
 </ul>
 
-#### Contributors
-[John Liuti](http://twitter.com/JohnLiuti)
-
 ### 3.1.1: April 7th, 2011
 
 <ul>
@@ -26,9 +28,6 @@
 	<li>Fixed comments to show avatars correctly</li>
 </ul>
 
-#### Contributors
-[Jenny Jui-Shan Liang](http://jsliang.twgogo.org/)
-
 ### 3.1.0: April 1st, 2011
 
 <ul>
@@ -37,9 +36,6 @@
 	<li>Made the theme directory and name renamable</li>
 </ul>
 
-#### Contributors
-[John Liuti](http://twitter.com/JohnLiuti), [Jeremiah Wall](http://jeremiahwall.com/)
-
 ### 3.0.0: March 28th, 2011
 
 <ul>
@@ -61,9 +57,6 @@
 	<li>Updated CSS for Gravity Forms 1.5</li>
 	<li>Added <code>searchform.php template</code></li>
 </ul>
-	
-#### Contributors
-[Scott Walkinshaw](http://www.scottwalkinshaw.com/), [Matthew Price](http://www.matthewaprice.com/), [Kyle Geminden](http://www.kylegeminden.com/), [Steve Jothen](http://twitter.com/sjothen)
 
 ### 2.4.0: January 25th, 2011
 
@@ -130,15 +123,19 @@
 	<li>Added Blueprint CSS to Starkers</li>
 </ul>
 
+## Contributors
+[Scott Walkinshaw](http://www.scottwalkinshaw.com/), [Matthew Price](http://www.matthewaprice.com/), [Kyle Geminden](http://www.kylegeminden.com/), [Steve Jothen](http://twitter.com/sjothen), [John Liuti](http://twitter.com/JohnLiuti), [Jeremiah Wall](http://jeremiahwall.com/), [Jenny Jui-Shan Liang](http://jsliang.twgogo.org/)
+
 ## License:
 
 Major components:
 
-* HTML5 Boileplate: [The Unlicense](http://unlicense.org)
+* HTML5 Boilerplate: [The Unlicense](http://unlicense.org)
 * Blueprint CSS: Modified MIT License
-* 960 Grid System: MIT/GPL license
-* Modernizr: MIT/BSD license
-* jQuery: MIT/GPL license
+* 960 Grid System: MIT/GPL License
+* The 1140px Grid: CC BY-SA 3.0 Australia License
+* Modernizr: MIT/BSD License
+* jQuery: MIT/GPL License
 
 Everything else:
 
@@ -146,4 +143,4 @@ Everything else:
 
 ## Summary:
 
-Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS and Starkers that will help you rapidly create brochure sites and blogs.
+Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS (or 960.gs) and Starkers that will help you rapidly create brochure sites and blogs.
diff --git a/style.css b/style.css
index 9facdec..66fc0a1 100644
--- a/style.css
+++ b/style.css
@@ -2,7 +2,7 @@
 Theme Name:         Roots
 Theme URI:          http://www.rootstheme.com/
 Description:        Starting theme based on HTML5 Boilerplate, Blueprint CSS and Starkers
-Version:            3.2.1
+Version:            3.2.2
 Author:             Ben Word
 Author URI:         http://benword.com/
 Tags:               roots, boilerplate, blueprint, starkers