From 2652d6e888ac31e50c8f361152d826836cb9bd9d Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Tue, 8 May 2012 21:29:32 -0600
Subject: [PATCH] Add config options for clean URLs and H5BP's .htaccess

---
 inc/roots-config.php   |  4 +++-
 inc/roots-htaccess.php | 14 ++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/inc/roots-config.php b/inc/roots-config.php
index 8f797ea..0162142 100644
--- a/inc/roots-config.php
+++ b/inc/roots-config.php
@@ -1,6 +1,8 @@
 <?php
 
-define('ROOT_RELATIVE_URLS',   true);
+define('ROOT_RELATIVE_URLS',   true);         // Use root relative URLs
+define('REWRITE_URLS',         true);         // Use rewrites for theme assets and plugin folders
+define('H5BP_HTACCESS',        true);         // Include the HTML5 Boilerplate .htaccess
 define('POST_EXCERPT_LENGTH',  40);
 define('BOOTSTRAP_RESPONSIVE', true);
 define('WRAP_CLASSES',         'container');
diff --git a/inc/roots-htaccess.php b/inc/roots-htaccess.php
index 0862d94..5c6fbc7 100644
--- a/inc/roots-htaccess.php
+++ b/inc/roots-htaccess.php
@@ -4,7 +4,7 @@
 // https://github.com/retlehs/roots/wiki/Nginx
 // https://github.com/retlehs/roots/wiki/Lighttpd
 
-if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') || stristr($_SERVER['SERVER_SOFTWARE'], 'litespeed') !== false)  {
+if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') || stristr($_SERVER['SERVER_SOFTWARE'], 'litespeed') !== false) {
 
   function roots_htaccess_writable() {
     if (!is_writable(get_home_path() . '.htaccess')) {
@@ -44,9 +44,15 @@ if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') || stristr($_SERVER['SERVER_S
 
   // only use clean urls if the theme isn't a child or an MU (Network) install
   if (!is_multisite() && !is_child_theme() && get_option('permalink_structure')) {
-    add_action('generate_rewrite_rules', 'roots_add_rewrites');
-    add_action('generate_rewrite_rules', 'roots_add_h5bp_htaccess');
-    if (!is_admin()) {
+    if (REWRITE_URLS) {
+      add_action('generate_rewrite_rules', 'roots_add_rewrites');
+    }
+
+    if (H5BP_HTACCESS) {
+      add_action('generate_rewrite_rules', 'roots_add_h5bp_htaccess');
+    }
+
+    if (!is_admin() && REWRITE_URLS) {
       $tags = array(
         'plugins_url',
         'bloginfo',