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

Make sure rewrites are added to .htaccess immediately after activation

Browse Source
This commit is contained in:
Ben Word
2013-05-01 11:05:23 -05:00
parent cab26194a3
commit ec94cfb2f5
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,4 +1,5 @@
### HEAD ### HEAD
* Make sure rewrites are added to .htaccess immediately after activation
* Move HTML5 Boilerplate's .htaccess to a [plugin](https://github.com/retlehs/wp-h5bp-htaccess) * Move HTML5 Boilerplate's .htaccess to a [plugin](https://github.com/retlehs/wp-h5bp-htaccess)
* Rename page-custom.php to template-custom.php * Rename page-custom.php to template-custom.php
* Don't warn about unwritable htaccess if that option is disabled * Don't warn about unwritable htaccess if that option is disabled

9
lib/activation.php
View File

@@ -38,8 +38,7 @@ function roots_theme_activation_options_add_page() {
); );
} else { } else {
if (is_admin() && isset($_GET['page']) && $_GET['page'] === 'theme_activation_options') { if (is_admin() && isset($_GET['page']) && $_GET['page'] === 'theme_activation_options') {
global $wp_rewrite; flush_rewrite_rules();
$wp_rewrite->flush_rules();
wp_redirect(admin_url('themes.php')); wp_redirect(admin_url('themes.php'));
exit; exit;
} }
@@ -217,14 +216,12 @@ function roots_theme_activation_action() {
if ($roots_theme_activation_options['change_permalink_structure']) { if ($roots_theme_activation_options['change_permalink_structure']) {
$roots_theme_activation_options['change_permalink_structure'] = false; $roots_theme_activation_options['change_permalink_structure'] = false;
global $wp_rewrite;
if (get_option('permalink_structure') !== '/%postname%/') { if (get_option('permalink_structure') !== '/%postname%/') {
global $wp_rewrite;
$wp_rewrite->set_permalink_structure('/%postname%/'); $wp_rewrite->set_permalink_structure('/%postname%/');
flush_rewrite_rules();
} }
$wp_rewrite->init();
$wp_rewrite->flush_rules();
} }
if ($roots_theme_activation_options['change_uploads_folder']) { if ($roots_theme_activation_options['change_uploads_folder']) {

2
lib/rewrites.php
View File

@@ -35,7 +35,7 @@ function roots_clean_urls($content) {
} }
} }
if (!is_multisite() && !is_child_theme() && get_option('permalink_structure')) { if (!is_multisite() && !is_child_theme()) {
if (current_theme_supports('rewrites')) { if (current_theme_supports('rewrites')) {
add_action('generate_rewrite_rules', 'roots_add_rewrites'); add_action('generate_rewrite_rules', 'roots_add_rewrites');
} }