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

Merge branch 'master' into 8.0.0

Browse Source 
Conflicts:
	lib/sidebar.php
This commit is contained in:
Ben Word
2015-02-19 11:18:49 -06:00
parent 4ae21f4e5a 2723692852
commit 73fa0de4d5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -23,7 +23,7 @@
* Remove `Roots_Nav_Walker` as default for all menus * Remove `Roots_Nav_Walker` as default for all menus
* Update to Bootstrap 3.3.1 * Update to Bootstrap 3.3.1
* Add some base comment styling * Add some base comment styling
* Make search tearm `required` in search form * Make search term `required` in search form
### 7.0.2: October 24th, 2014 ### 7.0.2: October 24th, 2014
* Simplify comments, use core comment form and list * Simplify comments, use core comment form and list

4
lib/sidebar.php
View File

@@ -2,6 +2,8 @@
namespace Roots\Sage\Sidebar; namespace Roots\Sage\Sidebar;
use Roots\Sage\Wrapper;
/** /**
* Determines whether or not to display the sidebar based on an array of conditional tags or page templates. * Determines whether or not to display the sidebar based on an array of conditional tags or page templates.
* *
@@ -44,6 +46,6 @@ class SageSidebar {
} }
private function checkPageTemplate($page_template) { private function checkPageTemplate($page_template) {
return is_page_template($page_template); return is_page_template($page_template) || Wrapper\SageWrapping::$base . '.php' === $page_template;
} }
} }