Do not use after_switch_theme hook, closes #1768

This commit is contained in:
QWp6t
2016-12-24 04:29:14 -08:00
parent 3258bff64e
commit 50a6f8ea60

View File

@@ -11,31 +11,6 @@ if (file_exists($composer = __DIR__ . '/vendor/autoload.php')) {
require_once $composer; require_once $composer;
} }
/**
* Here's what's happening with these hooks:
* 1. WordPress detects theme in themes/sage
* 2. When we activate, we tell WordPress that the theme is actually in themes/sage/templates
* 3. When we call get_template_directory() or get_template_directory_uri(), we point it back to themes/sage
*
* We do this so that the Template Hierarchy will look in themes/sage/templates for core WordPress themes
* But functions.php, style.css, and index.php are all still located in themes/sage
*
* get_template_directory() -> /srv/www/example.com/current/web/app/themes/sage
* get_stylesheet_directory() -> /srv/www/example.com/current/web/app/themes/sage
* locate_template()
* ├── STYLESHEETPATH -> /srv/www/example.com/current/web/app/themes/sage
* └── TEMPLATEPATH -> /srv/www/example.com/current/web/app/themes/sage/templates
*/
add_filter('template', function ($stylesheet) {
return dirname($stylesheet);
});
add_action('after_switch_theme', function () {
$stylesheet = get_option('template');
if (basename($stylesheet) !== 'templates') {
update_option('template', $stylesheet . '/templates');
}
});
/** /**
* Sage includes * Sage includes
* *
@@ -44,14 +19,37 @@ add_action('after_switch_theme', function () {
* *
* Please note that missing files will produce a fatal error. * Please note that missing files will produce a fatal error.
*/ */
$sage_includes = [ array_map(function ($file) {
'src/helpers.php', if (!locate_template("src/{$file}.php", true, true)) {
'src/setup.php',
'src/filters.php',
'src/admin.php'
];
array_walk($sage_includes, function ($file) {
if (!locate_template($file, true, true)) {
trigger_error(sprintf(__('Error locating %s for inclusion', 'sage'), $file), E_USER_ERROR); trigger_error(sprintf(__('Error locating %s for inclusion', 'sage'), $file), E_USER_ERROR);
} }
}, ['helpers', 'setup', 'filters', 'admin']);
/**
* Here's what's happening with these hooks:
* 1. WordPress initially detects theme in themes/sage
* 2. Upon activation, we tell WordPress that the theme is actually in themes/sage/templates
* 3. When we call get_template_directory() or get_template_directory_uri(), we point it back to themes/sage
*
* We do this so that the Template Hierarchy will look in themes/sage/templates for core WordPress themes
* But functions.php, style.css, and index.php are all still located in themes/sage
*
* This is not fully compatible with Live Preview without the use of a plugin to update the template option.
*
* get_template_directory() -> /srv/www/example.com/current/web/app/themes/sage
* get_stylesheet_directory() -> /srv/www/example.com/current/web/app/themes/sage
* locate_template()
* ├── STYLESHEETPATH -> /srv/www/example.com/current/web/app/themes/sage
* └── TEMPLATEPATH -> /srv/www/example.com/current/web/app/themes/sage/templates
*/
if (is_customize_preview()) {
return;
}
add_filter('template', function ($stylesheet) {
return dirname($stylesheet);
}); });
if (basename($stylesheet = get_option('template')) !== 'templates') {
update_option('template', "{$stylesheet}/templates");
wp_redirect($_SERVER['REQUEST_URI']);
exit();
}