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

Close #1791 - Only disable customizer if theme isn't activated

Browse Source
This commit is contained in:
Ben Word
2017-01-08 14:19:42 -07:00
parent 07405bf012
commit d930f19c0d
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
functions.php
View File

@@ -12,7 +12,7 @@
*/ */
$sage_error = function ($message, $subtitle = '', $title = '') { $sage_error = function ($message, $subtitle = '', $title = '') {
$title = $title ?: __('Sage › Error', 'sage'); $title = $title ?: __('Sage › Error', 'sage');
$footer = '<a href="https://roots.io/sage/docs">roots.io/sage/docs</a>'; $footer = '<a href="https://roots.io/sage/docs/">roots.io/sage/docs/</a>';
$message = "<h1>{$title}<br><small>{$subtitle}</small></h1><p>{$message}</p><p>{$footer}</p>"; $message = "<h1>{$title}<br><small>{$subtitle}</small></h1><p>{$message}</p><p>{$footer}</p>";
wp_die($message, $title); wp_die($message, $title);
}; };
@@ -57,7 +57,7 @@ array_map(function ($file) use ($sage_error) {
* We do this so that the Template Hierarchy will look in themes/sage/templates for core WordPress themes * 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 * 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. * This is not compatible with the WordPress Customizer theme preview prior to theme activation
* *
* get_template_directory() -> /srv/www/example.com/current/web/app/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 * get_stylesheet_directory() -> /srv/www/example.com/current/web/app/themes/sage
@@ -65,8 +65,8 @@ array_map(function ($file) use ($sage_error) {
* ├── STYLESHEETPATH -> /srv/www/example.com/current/web/app/themes/sage * ├── STYLESHEETPATH -> /srv/www/example.com/current/web/app/themes/sage
* └── TEMPLATEPATH -> /srv/www/example.com/current/web/app/themes/sage/templates * └── TEMPLATEPATH -> /srv/www/example.com/current/web/app/themes/sage/templates
*/ */
if (App\config('sage.disable_option_hack')) { if (is_customize_preview() && isset($_GET['theme'])) {
return; $sage_error(__('Theme must be activated prior to using the customizer.', 'sage'));
} }
add_filter('template', function ($stylesheet) { add_filter('template', function ($stylesheet) {
return dirname($stylesheet); return dirname($stylesheet);

5
src/setup.php
View File

@@ -146,8 +146,3 @@ add_action('after_setup_theme', function () {
* Init config * Init config
*/ */
sage()->bindIf('config', Config::class, true); sage()->bindIf('config', Config::class, true);
/**
* Disable option hack if we're in Customizer preview
*/
config(['sage.disable_option_hack' => is_customize_preview()]);