Merge pull request #88 from WP-for-Church/dev

Nikola Miljković · web-flow · commit 22f40980f9ab · 2017-09-14T20:40:22.000+02:00
Release 2.5.2
diff --git a/includes/CMB2/bootstrap.php b/includes/CMB2/bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * Bootstraps the CMB2 process
  *
diff --git a/includes/CMB2/includes/CMB2.php b/includes/CMB2/includes/CMB2.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB2 - The core metabox object
  *
diff --git a/includes/CMB2/includes/CMB2_Ajax.php b/includes/CMB2/includes/CMB2_Ajax.php
@@ -1,5 +1,5 @@
 <?php
-
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB2 ajax methods
  * (i.e. a lot of work to get oEmbeds to work with non-post objects)
diff --git a/includes/CMB2/includes/CMB2_Base.php b/includes/CMB2/includes/CMB2_Base.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB2 Base - Base object functionality.
  *
diff --git a/includes/CMB2/includes/CMB2_Boxes.php b/includes/CMB2/includes/CMB2_Boxes.php
@@ -1,5 +1,5 @@
 <?php
-
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * A CMB2 object instance registry for storing every CMB2 instance.
  *
diff --git a/includes/CMB2/includes/CMB2_Field.php b/includes/CMB2/includes/CMB2_Field.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB2 field objects
  *
diff --git a/includes/CMB2/includes/CMB2_Field_Display.php b/includes/CMB2/includes/CMB2_Field_Display.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB2 field display base.
  *
diff --git a/includes/CMB2/includes/CMB2_Hookup_Base.php b/includes/CMB2/includes/CMB2_Hookup_Base.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * Base class for hooking CMB2 into WordPress.
  *
diff --git a/includes/CMB2/includes/CMB2_JS.php b/includes/CMB2/includes/CMB2_JS.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * Handles the dependencies and enqueueing of the CMB2 JS scripts
  *
diff --git a/includes/CMB2/includes/CMB2_Options.php b/includes/CMB2/includes/CMB2_Options.php
@@ -8,7 +8,7 @@
  * @license   GPL-2.0+
  * @link      http://webdevstudios.com
  */
-
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * Retrieves an instance of CMB2_Option based on the option key
  *
diff --git a/includes/CMB2/includes/CMB2_Sanitize.php b/includes/CMB2/includes/CMB2_Sanitize.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB2 field sanitization
  *
diff --git a/includes/CMB2/includes/CMB2_Show_Filters.php b/includes/CMB2/includes/CMB2_Show_Filters.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * Show On Filters
  * Use the 'cmb2_show_on' filter to further refine the conditions
diff --git a/includes/CMB2/includes/CMB2_Types.php b/includes/CMB2/includes/CMB2_Types.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB field type objects
  *
diff --git a/includes/CMB2/includes/CMB2_Utils.php b/includes/CMB2/includes/CMB2_Utils.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB2 Utilities
  *
diff --git a/includes/CMB2/includes/CMB2_hookup.php b/includes/CMB2/includes/CMB2_hookup.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * Handles hooking CMB2 forms/metaboxes into the post/attachement/user screens
  * and handles hooking in and saving those fields.
diff --git a/includes/CMB2/includes/helper-functions.php b/includes/CMB2/includes/helper-functions.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB2 Helper Functions
  *
diff --git a/includes/CMB2/includes/rest-api/CMB2_REST.php b/includes/CMB2/includes/rest-api/CMB2_REST.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * Handles hooking CMB2 objects/fields into the WordPres REST API
  * which can allow fields to be read and/or updated.
diff --git a/includes/CMB2/includes/rest-api/CMB2_REST_Controller.php b/includes/CMB2/includes/rest-api/CMB2_REST_Controller.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 if ( ! class_exists( 'WP_REST_Controller' ) ) {
 	// Shim the WP_REST_Controller class if wp-api plugin not installed, & not in core.
 	require_once cmb2_dir( 'includes/shim/WP_REST_Controller.php' );
diff --git a/includes/CMB2/includes/rest-api/CMB2_REST_Controller_Boxes.php b/includes/CMB2/includes/rest-api/CMB2_REST_Controller_Boxes.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB2 objects/boxes endpoint for WordPres REST API.
  * Allows access to boxes configuration data.
diff --git a/includes/CMB2/includes/rest-api/CMB2_REST_Controller_Fields.php b/includes/CMB2/includes/rest-api/CMB2_REST_Controller_Fields.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB2 objects/fields endpoint for WordPres REST API.
  * Allows access to fields registered to a specific box.
diff --git a/includes/CMB2/includes/shim/WP_REST_Controller.php b/includes/CMB2/includes/shim/WP_REST_Controller.php
@@ -1,5 +1,5 @@
 <?php
-
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 
 abstract class WP_REST_Controller {
 
diff --git a/includes/CMB2/includes/types/CMB2_Type_Base.php b/includes/CMB2/includes/types/CMB2_Type_Base.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB base field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Checkbox.php b/includes/CMB2/includes/types/CMB2_Type_Checkbox.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB checkbox field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Colorpicker.php b/includes/CMB2/includes/types/CMB2_Type_Colorpicker.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB colorpicker field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_File.php b/includes/CMB2/includes/types/CMB2_Type_File.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB file field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_File_Base.php b/includes/CMB2/includes/types/CMB2_Type_File_Base.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB File base field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_File_List.php b/includes/CMB2/includes/types/CMB2_Type_File_List.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB file_list field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Multi_Base.php b/includes/CMB2/includes/types/CMB2_Type_Multi_Base.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB Multi base field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Multicheck.php b/includes/CMB2/includes/types/CMB2_Type_Multicheck.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB multicheck field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Oembed.php b/includes/CMB2/includes/types/CMB2_Type_Oembed.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB oembed field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Picker_Base.php b/includes/CMB2/includes/types/CMB2_Type_Picker_Base.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB Picker base field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Radio.php b/includes/CMB2/includes/types/CMB2_Type_Radio.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB radio field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Select.php b/includes/CMB2/includes/types/CMB2_Type_Select.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB select field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Select_Timezone.php b/includes/CMB2/includes/types/CMB2_Type_Select_Timezone.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB select_timezone field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Taxonomy_Base.php b/includes/CMB2/includes/types/CMB2_Type_Taxonomy_Base.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB Taxonomy base field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Taxonomy_Multicheck.php b/includes/CMB2/includes/types/CMB2_Type_Taxonomy_Multicheck.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB taxonomy_multicheck field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Taxonomy_Radio.php b/includes/CMB2/includes/types/CMB2_Type_Taxonomy_Radio.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB taxonomy_radio field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Taxonomy_Select.php b/includes/CMB2/includes/types/CMB2_Type_Taxonomy_Select.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB taxonomy_select field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Text.php b/includes/CMB2/includes/types/CMB2_Type_Text.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB text field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Text_Date.php b/includes/CMB2/includes/types/CMB2_Type_Text_Date.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB text_date field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp.php b/includes/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB text_datetime_timestamp field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp_Timezone.php b/includes/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp_Timezone.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB text_datetime_timestamp_timezone field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Text_Time.php b/includes/CMB2/includes/types/CMB2_Type_Text_Time.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB text_time field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Textarea.php b/includes/CMB2/includes/types/CMB2_Type_Textarea.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB textarea field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Textarea_Code.php b/includes/CMB2/includes/types/CMB2_Type_Textarea_Code.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB textarea_code field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Title.php b/includes/CMB2/includes/types/CMB2_Type_Title.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB title field type
  *
diff --git a/includes/CMB2/includes/types/CMB2_Type_Wysiwyg.php b/includes/CMB2/includes/types/CMB2_Type_Wysiwyg.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * CMB wysiwyg field type
  *
diff --git a/includes/CMB2/init.php b/includes/CMB2/init.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 /**
  * @category     WordPress_Plugin
  * @package      CMB2
diff --git a/includes/admin-functions.php b/includes/admin-functions.php
@@ -1,4 +1,6 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
+
 add_action( 'admin_init', 'wpfc_maybe_change_downloads_upload_dir', 999 );
 add_action( 'admin_menu', 'wpfc_remove_service_type_meta_box' );
 add_action( 'load-edit.php', 'wpfc_sermon_order_attach' );
diff --git a/includes/entry-views.php b/includes/entry-views.php
@@ -1,4 +1,6 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
+
 /**
  * Entry views is a script for calculating the number of views a post gets.  It is meant to be basic and
  * not a full-featured solution.  The idea is to allow theme/plugin authors to quickly load this file and
diff --git a/includes/helper-functions.php b/includes/helper-functions.php
@@ -1,4 +1,5 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
 
 /*
  *
diff --git a/includes/legacy-php.php b/includes/legacy-php.php
@@ -1,4 +1,6 @@
 <?php
+defined( 'ABSPATH' ) or die; // exit if accessed directly
+
 /*
  * This file will contain all functions that older PHP versions don't have
  */
diff --git a/includes/legacy.php b/includes/legacy.php
diff --git a/includes/options.php b/includes/options.php
diff --git a/includes/podcast-functions.php b/includes/podcast-functions.php
diff --git a/includes/shortcodes.php b/includes/shortcodes.php
diff --git a/includes/sm-deprecated-functions.php b/includes/sm-deprecated-functions.php
diff --git a/includes/taxonomy-images/deprecated.php b/includes/taxonomy-images/deprecated.php
diff --git a/includes/taxonomy-images/js/media-modal.js b/includes/taxonomy-images/js/media-modal.js
diff --git a/includes/taxonomy-images/public-filters.php b/includes/taxonomy-images/public-filters.php
diff --git a/includes/taxonomy-images/taxonomy-images.php b/includes/taxonomy-images/taxonomy-images.php
diff --git a/includes/template-tags.php b/includes/template-tags.php
diff --git a/includes/types-taxonomies.php b/includes/types-taxonomies.php
diff --git a/includes/widgets.php b/includes/widgets.php
diff --git a/readme.txt b/readme.txt
diff --git a/sermons.php b/sermons.php
diff --git a/views/archive-wpfc_sermon.php b/views/archive-wpfc_sermon.php
diff --git a/views/single-wpfc_sermon.php b/views/single-wpfc_sermon.php
diff --git a/views/taxonomy-wpfc_bible_book.php b/views/taxonomy-wpfc_bible_book.php
diff --git a/views/taxonomy-wpfc_preacher.php b/views/taxonomy-wpfc_preacher.php
diff --git a/views/taxonomy-wpfc_sermon_series.php b/views/taxonomy-wpfc_sermon_series.php
diff --git a/views/taxonomy-wpfc_sermon_topics.php b/views/taxonomy-wpfc_sermon_topics.php
diff --git a/views/taxonomy-wpfc_service_type.php b/views/taxonomy-wpfc_service_type.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+defined( 'ABSPATH' ) or die; // exit if accessed directly`
`2`	`3`	`/**`
`3`	`4`	`* Bootstraps the CMB2 process`
`4`	`5`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<?php`
`2`		`-`
	`2`	`+defined( 'ABSPATH' ) or die; // exit if accessed directly`
`3`	`3`	`/**`
`4`	`4`	`* A CMB2 object instance registry for storing every CMB2 instance.`
`5`	`5`	`*`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* @license GPL-2.0+`
`9`	`9`	`* @link http://webdevstudios.com`
`10`	`10`	`*/`
`11`		`-`
	`11`	`+defined( 'ABSPATH' ) or die; // exit if accessed directly`
`12`	`12`	`/**`
`13`	`13`	`* Retrieves an instance of CMB2_Option based on the option key`
`14`	`14`	`*`