From 56c3bb8367b6e0d8ec10eafa0309eb64e03d444b Mon Sep 17 00:00:00 2001 From: Ben Word Date: Sun, 27 Nov 2016 15:04:02 -0700 Subject: [PATCH] Remove sidebar defaults --- CHANGELOG.md | 1 + src/filters.php | 13 ------------- src/helpers.php | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f29fa8..fe2fc51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### HEAD +* Remove sidebar defaults ([#1760](https://github.com/roots/sage/pull/1760)) * Remove post formats ([#1759](https://github.com/roots/sage/pull/1759)) ### 9.0.0-alpha.4: November 16th, 2016 diff --git a/src/filters.php b/src/filters.php index 212c8cb..0a0bf0a 100644 --- a/src/filters.php +++ b/src/filters.php @@ -5,19 +5,6 @@ namespace App; use Roots\Sage\Template; use Roots\Sage\Template\Wrapper; -/** - * Determine which pages should NOT display the sidebar - * @link https://codex.wordpress.org/Conditional_Tags - */ -add_filter('sage/display_sidebar', function ($display) { - // The sidebar will NOT be displayed if ANY of the following return true - return $display ? !in_array(true, [ - is_404(), - is_front_page(), - is_page_template('templates/template-custom.php'), - ]) : $display; -}); - /** * Add classes */ diff --git a/src/helpers.php b/src/helpers.php index 34a39b0..db3c2c3 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -35,7 +35,7 @@ function asset_path($filename) function display_sidebar() { static $display; - isset($display) || $display = apply_filters('sage/display_sidebar', true); + isset($display) || $display = apply_filters('sage/display_sidebar', false); return $display; }