Merge branch 'master' into grunt

2013-03-04 21:59:38 -06:00
parent 838bea1402 33a9c7cd50
commit 545b125092
3 changed files with 320 additions and 1 deletions
--- a/lib/cleanup.php
+++ b/lib/cleanup.php
@@ -154,7 +154,7 @@ function roots_root_relative_url($input) {
 }

 function roots_enable_root_relative_urls() {
-  return !(is_admin() && in_array($GLOBALS['pagenow'], array('wp-login.php', 'wp-register.php'))) && current_theme_supports('root-relative-urls');
+  return !(is_admin() || in_array($GLOBALS['pagenow'], array('wp-login.php', 'wp-register.php'))) && current_theme_supports('root-relative-urls');
 }

 if (roots_enable_root_relative_urls()) {