From 6d6a76e4bd8689f06acf6d65acb669ca8a0ad352 Mon Sep 17 00:00:00 2001
From: Andrew Minion <andrew@andrewrminion.com>
Date: Mon, 18 Jun 2018 13:15:13 -0400
Subject: [PATCH 1/8] use pipe separator instead of line breaks for visual
 consistency

Makes appearance of tags and description consistent when sharing on social networks, or anywhere else the post content is used.
---
 sermons.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sermons.php b/sermons.php
index db3be7b..f3eeac2 100755
--- a/sermons.php
+++ b/sermons.php
@@ -390,8 +390,7 @@ public function render_sermon_into_content( $post_ID = 0, $post = null, $skip_ch
 		$description = strip_tags( trim( get_post_meta( $post->ID, 'sermon_description', true ) ) );
 
 		if ( '' !== $description ) {
-			$content .= PHP_EOL . PHP_EOL;
-			$content .= $description;
+			$content .= ' | ' . $description;
 		}
 
 		/**

From af14339d71b75c1a05e9d56cc847ac2692791f4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Mon, 24 Sep 2018 17:03:11 +0200
Subject: [PATCH 2/8] Revert to 2.14.0

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index ca1f60d..08729c1 100755
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: church, sermon, sermons, preaching, podcasting, manage, managing, podcasts
 Requires at least: 4.7.0
 Tested up to: 4.9
 Requires PHP: 5.3
-Stable tag: 2.15.0
+Stable tag: 2.14.0
 License: GPLv2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 

From 090544c3a0dd5777cfe53f9f181cf0f6e60d33cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Thu, 27 Sep 2018 16:50:58 +0200
Subject: [PATCH 3/8] Fix multi term filter for feed

Closes #235
---
 readme.txt                  |  3 +++
 views/wpfc-podcast-feed.php | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/readme.txt b/readme.txt
index 08729c1..999304f 100755
--- a/readme.txt
+++ b/readme.txt
@@ -103,6 +103,9 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 2. Sermon Files
 
 ## Changelog ##
+### 2.15.1 ###
+* Fix: Multi-term filter for feeds not working
+
 ### 2.15.0 ###
 * New: Add ability to override Sermon Manager's CSS by putting "sermon.css" file in theme (thanks @zSeriesGuy)
 * New: Add default image during installation (thanks @zSeriesGuy)
diff --git a/views/wpfc-podcast-feed.php b/views/wpfc-podcast-feed.php
index 7b281ac..6fdc645 100644
--- a/views/wpfc-podcast-feed.php
+++ b/views/wpfc-podcast-feed.php
@@ -63,12 +63,21 @@
 	) as $taxonomy
 ) {
 	if ( isset( $_GET[ $taxonomy ] ) ) {
-		$terms               = $_GET[ $taxonomy ];
-		$args['tax_query']   = ! empty( $args['tax_query'] ) ? $args['tax_query'] : array();
+		$terms = $_GET[ $taxonomy ];
+
+		// Override the default tax_query for that taxonomy.
+		if ( ! empty( $args['tax_query'] ) ) {
+			foreach ( $args['tax_query'] as $id => $arg ) {
+				if ( $arg['taxonomy'] === $taxonomy ) {
+					unset( $args['tax_query'][ $id ] );
+				}
+			}
+		}
+
 		$args['tax_query'][] = array(
 			'taxonomy' => $taxonomy,
 			'field'    => is_numeric( $terms ) ? 'term_id' : 'slug',
-			'terms'    => is_numeric( $terms ) ? intval( $terms ) : false !== strpos( $terms, ',' ) ? array_walk( explode( ',', $terms ), 'sanitize_title' ) : sanitize_title( $terms ),
+			'terms'    => is_numeric( $terms ) ? intval( $terms ) : false !== strpos( $terms, ',' ) ? array_map( 'sanitize_title', explode( ',', $terms ) ) : sanitize_title( $terms ),
 		);
 
 		if ( count( $args['tax_query'] ) > 1 ) {

From 817b0b7bc0a82d30a899f8c9337c3f1bcdfb046c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Tue, 2 Oct 2018 12:51:32 +0200
Subject: [PATCH 4/8] Add ability to filter CMB2 metaboxes

---
 includes/admin/sm-cmb-functions.php | 51 ++++++++++++++++-------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/includes/admin/sm-cmb-functions.php b/includes/admin/sm-cmb-functions.php
index 4e3a5da..758e1b7 100755
--- a/includes/admin/sm-cmb-functions.php
+++ b/includes/admin/sm-cmb-functions.php
@@ -11,16 +11,7 @@
  * Define the metaboxes and field configurations.
  */
 function wpfc_sermon_metaboxes() {
-
-	$cmb = new_cmb2_box( array(
-		'id'           => 'wpfc_sermon_details',
-		'title'        => esc_html__( 'Sermon Details', 'sermon-manager-for-wordpress' ),
-		'object_types' => array( 'wpfc_sermon' ), // Post type.
-		'context'      => 'normal',
-		'priority'     => 'high',
-		'show_names'   => true, // Show field names on the left.
-	) );
-
+	// Get the date format.
 	switch ( \SermonManager::getOption( 'date_format' ) ) {
 		case '0':
 			$date_format_label = 'mm/dd/YYYY';
@@ -44,7 +35,15 @@ function wpfc_sermon_metaboxes() {
 			break;
 	}
 
-	$cmb->add_field( array(
+	$sermon_details_meta = new_cmb2_box( array(
+		'id'           => 'wpfc_sermon_details',
+		'title'        => esc_html__( 'Sermon Details', 'sermon-manager-for-wordpress' ),
+		'object_types' => array( 'wpfc_sermon' ), // Post type.
+		'context'      => 'normal',
+		'priority'     => 'high',
+		'show_names'   => true, // Show field names on the left.
+	) );
+	$sermon_details_meta->add_field( array(
 		'name'        => esc_html__( 'Date Preached', 'sermon-manager-for-wordpress' ),
 		// translators: %s date format, effectively <code>d/m/Y</code> or the like.
 		'desc'        => esc_html__( '(optional)', 'sermon-manager-for-wordpress' ) . '<br>' . wp_sprintf( esc_html__( 'format: %s', 'sermon-manager-for-wordpress' ), $date_format_label ),
@@ -52,8 +51,7 @@ function wpfc_sermon_metaboxes() {
 		'type'        => 'text_date_timestamp',
 		'date_format' => $date_format,
 	) );
-
-	$cmb->add_field( array(
+	$sermon_details_meta->add_field( array(
 		'name'             => esc_html__( 'Service Type', 'sermon-manager-for-wordpress' ),
 		// translators: %s <a href="edit-tags.php?taxonomy=wpfc_service_type&post_type=wpfc_sermon" target="_blank">here</a>.
 		'desc'             => wp_sprintf( esc_html__( 'Select the type of service. Modify service types %s.', 'sermon-manager-for-wordpress' ), '<a href="' . admin_url( 'edit-tags.php?taxonomy=wpfc_service_type&post_type=wpfc_sermon' ) . '" target="_blank">here</a>' ),
@@ -62,8 +60,7 @@ function wpfc_sermon_metaboxes() {
 		'show_option_none' => true,
 		'options'          => cmb2_get_term_options( 'wpfc_service_type' ),
 	) );
-
-	$cmb->add_field( array(
+	$sermon_details_meta->add_field( array(
 		'name' => esc_html__( 'Main Bible Passage', 'sermon-manager-for-wordpress' ),
 		// translators: %1$s see msgid "John 3:16-18", effectively <code>John 3:16-18</code><br>.
 		// translators: %2$s see msgid "John 3:16-18, John 2:11-12", effectively <code>John 3:16-18, Luke 2:1-3</code>.
@@ -71,7 +68,7 @@ function wpfc_sermon_metaboxes() {
 		'id'   => 'bible_passage',
 		'type' => 'text',
 	) );
-	$cmb->add_field( array(
+	$sermon_details_meta->add_field( array(
 		'name'    => esc_html__( 'Description', 'sermon-manager-for-wordpress' ),
 		'desc'    => esc_html__( 'Type a brief description about this sermon, an outline, or a full manuscript', 'sermon-manager-for-wordpress' ),
 		'id'      => 'sermon_description',
@@ -82,7 +79,7 @@ function wpfc_sermon_metaboxes() {
 		),
 	) );
 
-	$cmb2 = new_cmb2_box( array(
+	$sermon_files_meta = new_cmb2_box( array(
 		'id'           => 'wpfc_sermon_files',
 		'title'        => esc_html__( 'Sermon Files', 'sermon-manager-for-wordpress' ),
 		'object_types' => array( 'wpfc_sermon' ),
@@ -90,7 +87,7 @@ function wpfc_sermon_metaboxes() {
 		'priority'     => 'high',
 		'show_names'   => true,
 	) );
-	$cmb2->add_field( array(
+	$sermon_files_meta->add_field( array(
 		'name' => esc_html__( 'Location of MP3', 'sermon-manager-for-wordpress' ),
 		'desc' => esc_html__( 'Upload an audio file or enter an URL.', 'sermon-manager-for-wordpress' ),
 		'id'   => 'sermon_audio',
@@ -99,26 +96,26 @@ function wpfc_sermon_metaboxes() {
 			'add_upload_file_text' => 'Add Sermon Audio', // Change upload button text. Default: "Add or Upload File".
 		),
 	) );
-	$cmb2->add_field( array(
+	$sermon_files_meta->add_field( array(
 		'name' => esc_html__( 'MP3 Duration', 'sermon-manager-for-wordpress' ),
 		// translators: %s see msgid "hh:mm:ss", effectively <code>hh:mm:ss</code>.
 		'desc' => wp_sprintf( esc_html__( 'Length in %s format (fill out only for remote files, local files will get data calculated by default)', 'sermon-manager-for-wordpress' ), '<code>' . esc_html__( 'hh:mm:ss', 'sermon-manager-for-wordpress' ) . '</code>' ),
 		'id'   => '_wpfc_sermon_duration',
 		'type' => 'text',
 	) );
-	$cmb2->add_field( array(
+	$sermon_files_meta->add_field( array(
 		'name' => esc_html__( 'Video Embed Code', 'sermon-manager-for-wordpress' ),
 		'desc' => esc_html__( 'Paste your embed code for Vimeo, Youtube, Facebook, or direct video file here', 'sermon-manager-for-wordpress' ),
 		'id'   => 'sermon_video',
 		'type' => 'textarea_code',
 	) );
-	$cmb2->add_field( apply_filters( 'sm_cmb2_field_sermon_video_link', array(
+	$sermon_files_meta->add_field( apply_filters( 'sm_cmb2_field_sermon_video_link', array(
 		'name' => esc_html__( 'Video Link', 'sermon-manager-for-wordpress' ),
 		'desc' => esc_html__( 'Paste your link for Vimeo, Youtube, Facebook, or direct video file here', 'sermon-manager-for-wordpress' ),
 		'id'   => 'sermon_video_link',
 		'type' => 'text_url',
 	) ) );
-	$cmb2->add_field( array(
+	$sermon_files_meta->add_field( array(
 		'name' => esc_html__( 'Sermon Notes', 'sermon-manager-for-wordpress' ),
 		'desc' => esc_html__( 'Upload a pdf file or enter an URL.', 'sermon-manager-for-wordpress' ),
 		'id'   => 'sermon_notes',
@@ -128,7 +125,7 @@ function wpfc_sermon_metaboxes() {
 			// Change upload button text. Default: "Add or Upload File".
 		),
 	) );
-	$cmb2->add_field( array(
+	$sermon_files_meta->add_field( array(
 		'name' => esc_html__( 'Bulletin', 'sermon-manager-for-wordpress' ),
 		'desc' => esc_html__( 'Upload a pdf file or enter an URL.', 'sermon-manager-for-wordpress' ),
 		'id'   => 'sermon_bulletin',
@@ -138,6 +135,14 @@ function wpfc_sermon_metaboxes() {
 			// Change upload button text. Default: "Add or Upload File".
 		),
 	) );
+
+	/**
+	 * Allows to add/remove SM CMB2 fields.
+	 *
+	 * @param CMB2 $sermon_details_meta Sermon Details meta.
+	 * @param CMB2 $sermon_files_meta   Sermon Files meta box.
+	 */
+	add_action( 'sm_cmb2_meta_fields', $sermon_details_meta, $sermon_files_meta );
 }
 
 add_action( 'cmb2_admin_init', 'wpfc_sermon_metaboxes' );

From 95b3d7f02840421b3f4310d92ffb0373e305fb2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Tue, 2 Oct 2018 12:56:30 +0200
Subject: [PATCH 5/8] Fix wrong function name

---
 includes/admin/sm-cmb-functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/admin/sm-cmb-functions.php b/includes/admin/sm-cmb-functions.php
index 758e1b7..bfe3bd9 100755
--- a/includes/admin/sm-cmb-functions.php
+++ b/includes/admin/sm-cmb-functions.php
@@ -142,7 +142,7 @@ function wpfc_sermon_metaboxes() {
 	 * @param CMB2 $sermon_details_meta Sermon Details meta.
 	 * @param CMB2 $sermon_files_meta   Sermon Files meta box.
 	 */
-	add_action( 'sm_cmb2_meta_fields', $sermon_details_meta, $sermon_files_meta );
+	do_action( 'sm_cmb2_meta_fields', $sermon_details_meta, $sermon_files_meta );
 }
 
 add_action( 'cmb2_admin_init', 'wpfc_sermon_metaboxes' );

From c0dfecbc84e2404fbe29158eadd8e9e162a6121b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Tue, 2 Oct 2018 15:23:13 +0200
Subject: [PATCH 6/8] Fix no sermons message not showing up

---
 includes/sm-template-functions.php    | 1 -
 views/archive-wpfc_sermon.php         | 2 +-
 views/taxonomy-wpfc_bible_book.php    | 2 +-
 views/taxonomy-wpfc_preacher.php      | 2 +-
 views/taxonomy-wpfc_sermon_series.php | 2 +-
 views/taxonomy-wpfc_sermon_topics.php | 2 +-
 views/taxonomy-wpfc_service_type.php  | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/includes/sm-template-functions.php b/includes/sm-template-functions.php
index 816105a..f836752 100755
--- a/includes/sm-template-functions.php
+++ b/includes/sm-template-functions.php
@@ -484,7 +484,6 @@ function wpfc_sermon_single_v2( $return = false, $post = null ) {
  */
 function wpfc_sermon_excerpt_v2( $return = false, $args = array() ) {
 	global $post;
-	global $wp_the_query;
 
 	if ( empty( $args ) ) {
 		$args = array(
diff --git a/views/archive-wpfc_sermon.php b/views/archive-wpfc_sermon.php
index 7844576..3758e90 100644
--- a/views/archive-wpfc_sermon.php
+++ b/views/archive-wpfc_sermon.php
@@ -32,7 +32,7 @@
 	}
 	echo '</div>';
 else :
-	__( 'Sorry, but there aren\'t any posts matching your query.' );
+	echo __( 'Sorry, but there aren\'t any posts matching your query.' );
 endif;
 ?>
 
diff --git a/views/taxonomy-wpfc_bible_book.php b/views/taxonomy-wpfc_bible_book.php
index 74863ee..d5add61 100644
--- a/views/taxonomy-wpfc_bible_book.php
+++ b/views/taxonomy-wpfc_bible_book.php
@@ -33,7 +33,7 @@
 	}
 	echo '</div>';
 else :
-	__( 'Sorry, but there are no posts matching your query.' );
+	echo __( 'Sorry, but there are no posts matching your query.' );
 endif;
 ?>
 
diff --git a/views/taxonomy-wpfc_preacher.php b/views/taxonomy-wpfc_preacher.php
index 74863ee..d5add61 100644
--- a/views/taxonomy-wpfc_preacher.php
+++ b/views/taxonomy-wpfc_preacher.php
@@ -33,7 +33,7 @@
 	}
 	echo '</div>';
 else :
-	__( 'Sorry, but there are no posts matching your query.' );
+	echo __( 'Sorry, but there are no posts matching your query.' );
 endif;
 ?>
 
diff --git a/views/taxonomy-wpfc_sermon_series.php b/views/taxonomy-wpfc_sermon_series.php
index 74863ee..d5add61 100644
--- a/views/taxonomy-wpfc_sermon_series.php
+++ b/views/taxonomy-wpfc_sermon_series.php
@@ -33,7 +33,7 @@
 	}
 	echo '</div>';
 else :
-	__( 'Sorry, but there are no posts matching your query.' );
+	echo __( 'Sorry, but there are no posts matching your query.' );
 endif;
 ?>
 
diff --git a/views/taxonomy-wpfc_sermon_topics.php b/views/taxonomy-wpfc_sermon_topics.php
index 74863ee..d5add61 100644
--- a/views/taxonomy-wpfc_sermon_topics.php
+++ b/views/taxonomy-wpfc_sermon_topics.php
@@ -33,7 +33,7 @@
 	}
 	echo '</div>';
 else :
-	__( 'Sorry, but there are no posts matching your query.' );
+	echo __( 'Sorry, but there are no posts matching your query.' );
 endif;
 ?>
 
diff --git a/views/taxonomy-wpfc_service_type.php b/views/taxonomy-wpfc_service_type.php
index 74863ee..d5add61 100644
--- a/views/taxonomy-wpfc_service_type.php
+++ b/views/taxonomy-wpfc_service_type.php
@@ -33,7 +33,7 @@
 	}
 	echo '</div>';
 else :
-	__( 'Sorry, but there are no posts matching your query.' );
+	echo __( 'Sorry, but there are no posts matching your query.' );
 endif;
 ?>
 

From b0ca4214b3ad05eb657f98bf6d9ebd8227ecea8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Wed, 3 Oct 2018 04:03:20 +0200
Subject: [PATCH 7/8] Add Genesis theme support (hack)

---
 views/partials/content-sermon-wrapper-end.php   | 5 +++++
 views/partials/content-sermon-wrapper-start.php | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/views/partials/content-sermon-wrapper-end.php b/views/partials/content-sermon-wrapper-end.php
index 59d48e3..64a058c 100644
--- a/views/partials/content-sermon-wrapper-end.php
+++ b/views/partials/content-sermon-wrapper-end.php
@@ -80,6 +80,11 @@
 		get_sidebar();
 		echo '</div>';
 		break;
+	case 'genesis':
+		echo '</main>';
+		get_sidebar();
+		echo '</div>';
+		break;
 	default:
 		ob_start();
 		get_sidebar();
diff --git a/views/partials/content-sermon-wrapper-start.php b/views/partials/content-sermon-wrapper-start.php
index 593b754..98a687c 100644
--- a/views/partials/content-sermon-wrapper-start.php
+++ b/views/partials/content-sermon-wrapper-start.php
@@ -67,6 +67,9 @@
 	case 'x':
 		echo '<div class="x-container max width offset"><div class="wpfc-sermon-container x-main left ' . $additional_classes . '" role="main">';
 		break;
+	case 'genesis':
+		echo '<div class="content-sidebar-wrap"><main class="content" id="genesis-content">';
+		break;
 	default:
 		echo apply_filters( 'sm_templates_wrapper_start', '<div class="wrap"><div id="primary" class="content-area"><main id="main" class="site-main wpfc-sermon-container ' . $additional_classes . '">' );
 		break;

From 622917608a6594555cb12b2eab6b127e2882e6cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Thu, 4 Oct 2018 16:05:17 +0200
Subject: [PATCH 8/8] Update versions

---
 readme.txt  | 2 +-
 sermons.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 999304f..e7f634b 100755
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: church, sermon, sermons, preaching, podcasting, manage, managing, podcasts
 Requires at least: 4.7.0
 Tested up to: 4.9
 Requires PHP: 5.3
-Stable tag: 2.14.0
+Stable tag: 2.15.1
 License: GPLv2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
diff --git a/sermons.php b/sermons.php
index fa61d1f..0287e24 100755
--- a/sermons.php
+++ b/sermons.php
@@ -3,7 +3,7 @@
  * Plugin Name: Sermon Manager for WordPress
  * Plugin URI: https://www.wpforchurch.com/products/sermon-manager-for-wordpress/
  * Description: Add audio and video sermons, manage speakers, series, and more.
- * Version: 2.15.0
+ * Version: 2.15.1
  * Author: WP for Church
  * Author URI: https://www.wpforchurch.com/
  * Requires at least: 4.5