diff --git a/lib/config.php b/lib/config.php index f97441a..6a88beb 100644 --- a/lib/config.php +++ b/lib/config.php @@ -9,40 +9,32 @@ use Roots\Sage; */ add_theme_support('soil-clean-up'); // Enable clean up from Soil add_theme_support('soil-relative-urls'); // Enable relative URLs from Soil -add_theme_support('soil-nice-search'); // Enable /?s= to /search/ redirect from Soil +add_theme_support('soil-nice-search'); // Enable nice search from Soil add_theme_support('bootstrap-gallery'); // Enable Bootstrap's thumbnails component on [gallery] add_theme_support('jquery-cdn'); // Enable to load jQuery from the Google CDN /** * Configuration values */ -define('GOOGLE_ANALYTICS_ID', ''); // UA-XXXXX-Y (Note: Universal Analytics only, not Classic Analytics) +if (!defined('GOOGLE_ANALYTICS_ID')) { + // Format: UA-XXXXX-Y (Note: Universal Analytics only) + define('GOOGLE_ANALYTICS_ID', ''); +} if (!defined('WP_ENV')) { - define('WP_ENV', 'production'); // assets.php checks for values 'production' or 'development' + // Fallback if WP_ENV isn't defined in your WordPress config + // Used in lib/assets.php to check for 'development' or 'production' + define('WP_ENV', 'production'); } -/** - * Add body class if sidebar is active - */ -function sidebar_body_class($classes) { - if (display_sidebar()) { - $classes[] = 'sidebar-primary'; - } - return $classes; -} -add_filter('body_class', __NAMESPACE__ . '\\sidebar_body_class'); - /** * Define which pages shouldn't have the sidebar - * - * See lib/sidebar.php for more details */ function display_sidebar() { static $display; if (!isset($display)) { - $conditionalCheck = new ConditionalTagCheck( + $conditionalCheck = new Sage\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. @@ -56,6 +48,7 @@ function display_sidebar() { * Examples: * * 'is_single' + * 'is_archive' * ['is_page', ['about-me']] * ['is_tax', ['flavor', 'mild']] * ['is_page_template', ['about.php']] @@ -81,4 +74,6 @@ function display_sidebar() { * Example: If the content area is 640px wide, set $content_width = 620; so images and videos will not overflow. * Default: 1140px is the default Bootstrap container width. */ -if (!isset($content_width)) { $content_width = 1140; } +if (!isset($content_width)) { + $content_width = 1140; +} diff --git a/lib/extras.php b/lib/extras.php index 40140cc..fdf8d9d 100644 --- a/lib/extras.php +++ b/lib/extras.php @@ -2,6 +2,28 @@ namespace Roots\Sage\Extras; +use Roots\Sage\Config; + +/** + * Add classes + */ +function body_class($classes) { + // Add page slug if it doesn't exist + if (is_single() || is_page() && !is_front_page()) { + if (!in_array(basename(get_permalink()), $classes)) { + $classes[] = basename(get_permalink()); + } + } + + // Add class if sidebar is active + if (Config\display_sidebar()) { + $classes[] = 'sidebar-primary'; + } + + return $classes; +} +add_filter('body_class', __NAMESPACE__ . '\\body_class'); + /** * Clean up the_excerpt() */ diff --git a/lib/utils.php b/lib/utils.php index 6691f7d..71df2fc 100644 --- a/lib/utils.php +++ b/lib/utils.php @@ -12,19 +12,6 @@ function get_search_form() { } add_filter('get_search_form', __NAMESPACE__ . '\\get_search_form'); -/** - * Add page slug to body_class() classes if it doesn't exist - */ -function body_class($classes) { - if (is_single() || is_page() && !is_front_page()) { - if (!in_array(basename(get_permalink()), $classes)) { - $classes[] = basename(get_permalink()); - } - } - return $classes; -} -add_filter('body_class', __NAMESPACE__ . '\\body_class'); - /** * Make a URL relative */