Merge pull request #990 from ylkyrg/cosmetics

Use shorter ABSPATH check
This commit is contained in:
Holger 2019-06-29 11:58:56 +02:00 committed by GitHub
commit a1e9bfb7cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 116 additions and 171 deletions

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
@ -76,8 +75,8 @@ $container = get_theme_mod( 'understrap_container_type' );
the_title( '', '', false ) the_title( '', '', false )
); );
?> ?>
<?php understrap_posted_on(); ?> <?php understrap_posted_on(); ?>
<?php esc_html_e( 'in', 'understrap' ); ?> <?php esc_html_e( 'in', 'understrap' ); ?>
<?php the_category( '&' ); ?> <?php the_category( '&' ); ?>
</li> </li>
<?php endwhile; ?> <?php endwhile; ?>

View File

@ -8,9 +8,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
/* /*
* If the current post is protected by a password and * If the current post is protected by a password and

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
?> ?>

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
$understrap_includes = array( $understrap_includes = array(
'/theme-settings.php', // Initialize theme default settings. '/theme-settings.php', // Initialize theme default settings.

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
<?php if ( is_active_sidebar( 'hero' ) || is_active_sidebar( 'statichero' ) || is_active_sidebar( 'herocanvas' ) ) : ?> <?php if ( is_active_sidebar( 'hero' ) || is_active_sidebar( 'statichero' ) || is_active_sidebar( 'herocanvas' ) ) : ?>

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' ); $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
?> ?>

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
</div><!-- #closing the primary container from /global-templates/left-sidebar-check.php --> </div><!-- #closing the primary container from /global-templates/left-sidebar-check.php -->

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
?> ?>

View File

@ -5,9 +5,8 @@
* @package WP-Bootstrap-Navwalker * @package WP-Bootstrap-Navwalker
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
/* /*
* Class Name: WP_Bootstrap_Navwalker * Class Name: WP_Bootstrap_Navwalker

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
// Comments form. // Comments form.
add_filter( 'comment_form_default_fields', 'understrap_bootstrap_comment_form_fields' ); add_filter( 'comment_form_default_fields', 'understrap_bootstrap_comment_form_fields' );

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
add_action( 'after_setup_theme', 'understrap_custom_header_setup' ); add_action( 'after_setup_theme', 'understrap_custom_header_setup' );

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
/** /**
* Add postMessage support for site title and description for the Theme Customizer. * Add postMessage support for site title and description for the Theme Customizer.

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
/** /**
* Count number of widgets in a sidebar * Count number of widgets in a sidebar
@ -34,7 +33,7 @@ if ( ! function_exists( 'understrap_slbd_count_widgets' ) ) {
// If two widgets are published // If two widgets are published
$widget_classes .= ' col-md-2'; $widget_classes .= ' col-md-2';
elseif ( $widget_count >= 3 ) : elseif ( $widget_count >= 3 ) :
// Three widgets per row if there's three or more widgets // Three widgets per row if there's three or more widgets
$widget_classes .= ' col-md-4'; $widget_classes .= ' col-md-4';
elseif ( 2 == $widget_count ) : elseif ( 2 == $widget_count ) :
// If two widgets are published // If two widgets are published
@ -42,8 +41,8 @@ if ( ! function_exists( 'understrap_slbd_count_widgets' ) ) {
elseif ( 1 == $widget_count ) : elseif ( 1 == $widget_count ) :
// If just on widget is active // If just on widget is active
$widget_classes .= ' col-md-12'; $widget_classes .= ' col-md-12';
endif; endif;
return $widget_classes; return $widget_classes;
endif; endif;
} }
} }

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
/** /**
* Registers an editor stylesheet for the theme. * Registers an editor stylesheet for the theme.

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
if ( ! function_exists( 'understrap_scripts' ) ) { if ( ! function_exists( 'understrap_scripts' ) ) {
/** /**

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
add_filter( 'body_class', 'understrap_body_classes' ); add_filter( 'body_class', 'understrap_body_classes' );

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
if ( ! function_exists( 'understrap_site_info' ) ) { if ( ! function_exists( 'understrap_site_info' ) ) {
/** /**

View File

@ -7,9 +7,8 @@
* @package UnderStrap * @package UnderStrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
/** /**
* Jetpack setup function. * Jetpack setup function.

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
if ( ! function_exists( 'understrap_pagination' ) ) { if ( ! function_exists( 'understrap_pagination' ) ) {

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
// Set the content width based on the theme's design and stylesheet. // Set the content width based on the theme's design and stylesheet.
if ( ! isset( $content_width ) ) { if ( ! isset( $content_width ) ) {

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
/** /**
* Prints HTML with meta information for the current post-date/time and author. * Prints HTML with meta information for the current post-date/time and author.

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
if ( ! function_exists( 'understrap_setup_theme_default_settings' ) ) { if ( ! function_exists( 'understrap_setup_theme_default_settings' ) ) {
function understrap_setup_theme_default_settings() { function understrap_setup_theme_default_settings() {

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
/** /**
* Add filter to the parameters passed to a widget's display callback. * Add filter to the parameters passed to a widget's display callback.

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
add_action( 'after_setup_theme', 'understrap_woocommerce_support' ); add_action( 'after_setup_theme', 'understrap_woocommerce_support' );
if ( ! function_exists( 'understrap_woocommerce_support' ) ) { if ( ! function_exists( 'understrap_woocommerce_support' ) ) {

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
/** /**
* Adds support for wp.com-specific theme functions. * Adds support for wp.com-specific theme functions.

View File

@ -11,9 +11,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();

View File

@ -5,8 +5,7 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
the_content(); the_content();

View File

@ -5,8 +5,7 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
the_content(); the_content();

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
<section class="no-results not-found"> <section class="no-results not-found">
@ -43,5 +42,5 @@ if ( ! defined( 'ABSPATH' ) ) {
get_search_form(); get_search_form();
endif; ?> endif; ?>
</div><!-- .page-content --> </div><!-- .page-content -->
</section><!-- .no-results --> </section><!-- .no-results -->

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
<article <?php post_class(); ?> id="post-<?php the_ID(); ?>"> <article <?php post_class(); ?> id="post-<?php the_ID(); ?>">

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
<article <?php post_class(); ?> id="post-<?php the_ID(); ?>"> <article <?php post_class(); ?> id="post-<?php the_ID(); ?>">

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
<article <?php post_class(); ?> id="post-<?php the_ID(); ?>"> <article <?php post_class(); ?> id="post-<?php the_ID(); ?>">

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
<article <?php post_class(); ?> id="post-<?php the_ID(); ?>"> <article <?php post_class(); ?> id="post-<?php the_ID(); ?>">

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html <?php language_attributes(); ?>> <html <?php language_attributes(); ?>>

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );

View File

@ -8,9 +8,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );

View File

@ -7,9 +7,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );

View File

@ -10,9 +10,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
<form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>" role="search"> <form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>" role="search">

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
<?php if ( is_active_sidebar( 'hero' ) ) : ?> <?php if ( is_active_sidebar( 'hero' ) ) : ?>

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
<?php if ( is_active_sidebar( 'herocanvas' ) ) : ?> <?php if ( is_active_sidebar( 'herocanvas' ) ) : ?>

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
if ( ! is_active_sidebar( 'left-sidebar' ) ) { if ( ! is_active_sidebar( 'left-sidebar' ) ) {
return; return;

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
if ( ! is_active_sidebar( 'right-sidebar' ) ) { if ( ! is_active_sidebar( 'right-sidebar' ) ) {
return; return;

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
?> ?>

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
if ( ! is_active_sidebar( 'sidebar-1' ) ) { if ( ! is_active_sidebar( 'sidebar-1' ) ) {
return; return;

View File

@ -5,9 +5,8 @@
* @package understrap * @package understrap
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );

View File

@ -18,9 +18,8 @@
* @version 3.6.1 * @version 3.6.1
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
?> ?>
<a href="<?php echo esc_url( wc_get_checkout_url() );?>" class="btn btn-primary btn-lg btn-block"> <a href="<?php echo esc_url( wc_get_checkout_url() );?>" class="btn btn-primary btn-lg btn-block">

View File

@ -16,9 +16,8 @@
* @version 3.6.1 * @version 3.6.1
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
if ( is_user_logged_in() ) { if ( is_user_logged_in() ) {
return; return;

View File

@ -15,9 +15,8 @@
* @version 3.6.1 * @version 3.6.1
*/ */
if ( ! defined( 'ABSPATH' ) ) { // Exit if accessed directly.
exit; // Exit if accessed directly. defined( 'ABSPATH' ) || exit;
}
do_action( 'woocommerce_before_customer_login_form' ); ?> do_action( 'woocommerce_before_customer_login_form' ); ?>