Merge pull request #1494 from roots/QWp6t-conditionaltagcheck

Remove ConditonalTagCheck class
roots · Sep 23, 2015 · a6c9d4d · a6c9d4d
2 parents 2aafd22 + 6d05c67
commit a6c9d4d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 73 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Remove ConditionalTagCheck class ([#1494](https://github.com/roots/sage/pull/1494))
 * Add search templates ([#1459](https://github.com/roots/sage/issues/1459))
 * Allow `debugger` statements in development JavaScript ([#1487](https://github.com/roots/sage/issues/1487))
 

diff --git a/functions.php b/functions.php
@@ -13,7 +13,6 @@
   'lib/utils.php',                 // Utility functions
   'lib/init.php',                  // Initial theme setup and constants
   'lib/wrapper.php',               // Theme wrapper class
-  'lib/conditional-tag-check.php', // ConditionalTagCheck class
   'lib/config.php',                // Configuration
   'lib/assets.php',                // Scripts and stylesheets
   'lib/titles.php',                // Page titles

diff --git a/lib/conditional-tag-check.php b/lib/conditional-tag-check.php
diff --git a/lib/config.php b/lib/config.php
@@ -28,38 +28,18 @@
 }
 
 /**
- * Define which pages shouldn't have the sidebar
+ * Determine which pages should NOT display the sidebar
  */
 function display_sidebar() {
   static $display;
 
-  if (!isset($display)) {
-    $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.
-       *
-       * To use a function that accepts arguments, use an array instead of just the function name as a string.
-       *
-       * Examples:
-       *
-       * 'is_single'
-       * 'is_archive'
-       * ['is_page', 'about-me']
-       * ['is_tax', ['flavor', 'mild']]
-       * ['is_page_template', 'about.php']
-       * ['is_post_type_archive', ['foo', 'bar', 'baz']]
-       *
-       */
-      [
-        'is_404',
-        'is_front_page',
-        ['is_page_template', 'template-custom.php']
-      ]
-    );
+  isset($display) || $display = !in_array(true, [
+    // The sidebar will NOT be displayed if ANY of the following return true.
+    // @link https://codex.wordpress.org/Conditional_Tags
+    is_404(),
+    is_front_page(),
+    is_page_template('template-custom.php'),
+  ]);
 
-    $display = apply_filters('sage/display_sidebar', $conditionalCheck->result);
-  }
-
-  return $display;
+  return apply_filters('sage/display_sidebar', $display);
 }