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

Merge pull request #1390 from kalenjohnson/conditional-tag-patch

Browse Source 
Referencing ConditionalTagCheck directly
This commit is contained in:
Ben Word
2015-03-18 17:58:08 -05:00
parent a7ec5423db 796eaf1600
commit 03b9f40464
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config.php
View File

@@ -2,7 +2,7 @@
namespace Roots\Sage\Config;
use Roots\Sage;
use Roots\Sage\ConditionalTagCheck;
/**
* Enable theme features
@@ -40,7 +40,7 @@ function display_sidebar() {
static $display;
if (!isset($display)) {
$conditionalCheck = new Sage\ConditionalTagCheck(
$conditionalCheck = new ConditionalTagCheck(
/**
* Any of these conditional tags that return true won't show the sidebar.
* You can also specify your own custom function as long as it returns a boolean.

2
lib/nav.php
View File

@@ -15,7 +15,7 @@ use Roots\Sage\Utils;
* <li class="menu-home"><a href="/">Home</a></li>
* <li class="menu-sample-page"><a href="/sample-page/">Sample Page</a></li>
*/
class SageNavWalker extends \Walker_Nav_Menu {
class NavWalker extends \Walker_Nav_Menu {
private $cpt; // Boolean, is current post a custom post type
private $archive; // Stores the archive page for current URL

4
templates/header.php
View File

@@ -1,4 +1,4 @@
<?php use Roots\Sage\Nav; ?>
<?php use Roots\Sage\Nav\NavWalker; ?>
<header class="banner navbar navbar-default navbar-static-top" role="banner">
<div class="container">
@@ -15,7 +15,7 @@
<nav class="collapse navbar-collapse" role="navigation">
<?php
if (has_nav_menu('primary_navigation')) :
wp_nav_menu(['theme_location' => 'primary_navigation', 'walker' => new Nav\SageNavWalker(), 'menu_class' => 'nav navbar-nav']);
wp_nav_menu(['theme_location' => 'primary_navigation', 'walker' => new NavWalker(), 'menu_class' => 'nav navbar-nav']);
endif;
?>
</nav>