Merge pull request #1390 from kalenjohnson/conditional-tag-patch
Referencing ConditionalTagCheck directly
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace Roots\Sage\Config;
|
namespace Roots\Sage\Config;
|
||||||
|
|
||||||
use Roots\Sage;
|
use Roots\Sage\ConditionalTagCheck;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enable theme features
|
* Enable theme features
|
||||||
@@ -40,7 +40,7 @@ function display_sidebar() {
|
|||||||
static $display;
|
static $display;
|
||||||
|
|
||||||
if (!isset($display)) {
|
if (!isset($display)) {
|
||||||
$conditionalCheck = new Sage\ConditionalTagCheck(
|
$conditionalCheck = new ConditionalTagCheck(
|
||||||
/**
|
/**
|
||||||
* Any of these conditional tags that return true won't show the sidebar.
|
* 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.
|
* You can also specify your own custom function as long as it returns a boolean.
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ use Roots\Sage\Utils;
|
|||||||
* <li class="menu-home"><a href="/">Home</a></li>
|
* <li class="menu-home"><a href="/">Home</a></li>
|
||||||
* <li class="menu-sample-page"><a href="/sample-page/">Sample Page</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 $cpt; // Boolean, is current post a custom post type
|
||||||
private $archive; // Stores the archive page for current URL
|
private $archive; // Stores the archive page for current URL
|
||||||
|
|
||||||
|
|||||||
@@ -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">
|
<header class="banner navbar navbar-default navbar-static-top" role="banner">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
<nav class="collapse navbar-collapse" role="navigation">
|
<nav class="collapse navbar-collapse" role="navigation">
|
||||||
<?php
|
<?php
|
||||||
if (has_nav_menu('primary_navigation')) :
|
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;
|
endif;
|
||||||
?>
|
?>
|
||||||
</nav>
|
</nav>
|
||||||
|
|||||||
Reference in New Issue
Block a user