framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes #250 - some plugins cause an error with roots h5bp rewrites

Browse Source
This commit is contained in:
Ben Word
2012-01-29 18:27:26 -07:00
parent 01696fde63
commit 2abc629272
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
inc/roots-htaccess.php
View File

@@ -53,6 +53,7 @@ if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) {
if (!is_multisite() && !is_child_theme()) { if (!is_multisite() && !is_child_theme()) {
add_action('generate_rewrite_rules', 'roots_add_rewrites'); add_action('generate_rewrite_rules', 'roots_add_rewrites');
add_action('generate_rewrite_rules', 'roots_add_h5bp_htaccess'); add_action('generate_rewrite_rules', 'roots_add_h5bp_htaccess');
add_action('activate_plugin', 'roots_add_h5bp_htaccess');
if (!is_admin()) { if (!is_admin()) {
add_filter('plugins_url', 'roots_clean_plugins'); add_filter('plugins_url', 'roots_clean_plugins');
add_filter('bloginfo', 'roots_clean_assets'); add_filter('bloginfo', 'roots_clean_assets');
@@ -67,19 +68,23 @@ if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) {
function roots_add_h5bp_htaccess($content) { function roots_add_h5bp_htaccess($content) {
global $wp_rewrite; global $wp_rewrite;
if (!function_exists('get_home_path')) {
return;
}
$home_path = get_home_path(); $home_path = get_home_path();
$htaccess_file = $home_path . '.htaccess'; $htaccess_file = $home_path . '.htaccess';
if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) { if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
if (got_mod_rewrite()) { if (got_mod_rewrite()) {
$h5bp_rules = extract_from_markers($htaccess_file, 'HTML5 Boilerplate'); $h5bp_rules = extract_from_markers($htaccess_file, 'HTML5 Boilerplate');
if ($h5bp_rules === array()) { if ($h5bp_rules === array()) {
$filename = __DIR__ . '/h5bp-htaccess'; $filename = __DIR__ . '/h5bp-htaccess';
return insert_with_markers($htaccess_file, 'HTML5 Boilerplate', extract_from_markers($filename, 'HTML5 Boilerplate')); return insert_with_markers($htaccess_file, 'HTML5 Boilerplate', extract_from_markers($filename, 'HTML5 Boilerplate'));
} }
} }
} }
return $content; return $content;
} }