Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of github.com:retlehs/roots

  • Loading branch information...
commit a39bc3d5e3c0c6a00d730561b219974b2be0a992 2 parents 164a416 + ad5e287
Ben Word retlehs authored

Showing 1 changed file with 4 additions and 2 deletions. Show diff stats Hide diff stats

  1. +4 2 includes/roots-cleanup.php
6 includes/roots-cleanup.php
@@ -43,12 +43,13 @@ function roots_clean_plugins($content) {
43 43 return $content;
44 44 }
45 45
46   -// only use clean urls if the theme isn't a child
47   -if ($theme_data['Template'] === '') {
  46 +// only use clean urls if the theme isn't a child or an MU (Network) install
  47 +if ((!defined('WP_ALLOW_MULTISITE') || (defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE !== true)) && $theme_data['Template'] === '') {
48 48 add_action('generate_rewrite_rules', 'roots_add_rewrites');
49 49 add_filter('plugins_url', 'roots_clean_plugins');
50 50 add_filter('bloginfo', 'roots_clean_assets');
51 51 add_filter('stylesheet_directory_uri', 'roots_clean_assets');
  52 + add_filter('template_directory_uri', 'roots_clean_assets');
52 53 }
53 54
54 55 // redirect /?s to /search/
@@ -73,6 +74,7 @@ function roots_root_relative_url($input) {
73 74 add_filter('bloginfo_url', 'roots_root_relative_url');
74 75 add_filter('theme_root_uri', 'roots_root_relative_url');
75 76 add_filter('stylesheet_directory_uri', 'roots_root_relative_url');
  77 +add_filter('template_directory_uri', 'roots_root_relative_url');
76 78 add_filter('the_permalink', 'roots_root_relative_url');
77 79 add_filter('wp_list_pages', 'roots_root_relative_url');
78 80 add_filter('wp_list_categories', 'roots_root_relative_url');

0 comments on commit a39bc3d

Please sign in to comment.
Something went wrong with that request. Please try again.