From b0bbed3e9f71ca813c868dc70efc50189ae16900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Tue, 12 Jun 2018 12:17:11 +0200
Subject: [PATCH 01/22] Add contribution for the previous release

---
 readme.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 266fe94..b7d0a4f 100755
--- a/readme.txt
+++ b/readme.txt
@@ -105,8 +105,8 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 ## Changelog ##
 ### 2.13.1 ###
 * New: Add `list_podcasts` shortcode (thanks @macbookandrew!)
-* New: Support for OceanWP theme
-* Fix: Archive page slug not applying
+* New: Support for OceanWP theme (thanks @zSeriesGuy!)
+* Fix: Archive page slug not applying (thanks @zSeriesGuy!)
 * Fix: Feed showing PHP notice in some rare cases
 * Fix: Taxonomy list/images ignoring arguments
 * Fix: Wrappers do not get overriden

From 1990b09b6fd845c4f87b83c3244321c9d14f44d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Tue, 12 Jun 2018 12:18:45 +0200
Subject: [PATCH 02/22] Fix attribution

---
 readme.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index b7d0a4f..a28d290 100755
--- a/readme.txt
+++ b/readme.txt
@@ -106,10 +106,10 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 ### 2.13.1 ###
 * New: Add `list_podcasts` shortcode (thanks @macbookandrew!)
 * New: Support for OceanWP theme (thanks @zSeriesGuy!)
-* Fix: Archive page slug not applying (thanks @zSeriesGuy!)
+* Fix: Archive page slug not applying
 * Fix: Feed showing PHP notice in some rare cases
 * Fix: Taxonomy list/images ignoring arguments
-* Fix: Wrappers do not get overriden
+* Fix: Wrappers do not get overriden (thanks @zSeriesGuy!)
 
 ### 2.13.0 ###
 * New: Add a simpler way of overriding sermon render

From abd3bd00001c74848ee2b284d29462bf0c225f36 Mon Sep 17 00:00:00 2001
From: Robert Main <robertmain@users.noreply.github.com>
Date: Tue, 12 Jun 2018 20:50:44 -0400
Subject: [PATCH 03/22] Update ISSUE_TEMPLATE.md

Remove numbered list from expected/actual headings
---
 .github/ISSUE_TEMPLATE.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8b8ce96..5ee9c01 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,12 +1,10 @@
 ### Expected Behaviour
 
-1. 
-2. 
+
 
 ### Actual Behaviour
 
-1. 
-2. 
+
 
 ### Steps To Reproduce
 

From 06848d67a0a773ab6197d7f155461c6d1232a6ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Fri, 22 Jun 2018 23:34:07 +0200
Subject: [PATCH 04/22] Fix excerpt meta box not showing up

---
 includes/class-sm-post-types.php | 2 +-
 readme.txt                       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/includes/class-sm-post-types.php b/includes/class-sm-post-types.php
index f0db1de..22bd7ed 100644
--- a/includes/class-sm-post-types.php
+++ b/includes/class-sm-post-types.php
@@ -277,7 +277,7 @@ public static function register_post_types() {
 				'comments',
 				'entry-views',
 				'elementor',
-				( ! \SermonManager::getOption( 'post_excerpt_enabled', 1 ) ? 'excerpt' : null ),
+				'excerpt',
 				'revisions',
 			),
 		) ) );
diff --git a/readme.txt b/readme.txt
index a28d290..e0e8410 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.13.2 ###
+* Fix: Excerpt meta box not showing up
+
 ### 2.13.1 ###
 * New: Add `list_podcasts` shortcode (thanks @macbookandrew!)
 * New: Support for OceanWP theme (thanks @zSeriesGuy!)

From 203fdb4921f745c22fea971593f188760d5d5747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Tue, 26 Jun 2018 00:22:43 +0200
Subject: [PATCH 05/22] Add actions for enqueueing scripts and styles after SM

---
 sermons.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sermons.php b/sermons.php
index db3be7b..deeb1b8 100755
--- a/sermons.php
+++ b/sermons.php
@@ -482,6 +482,9 @@ public static function enqueue_scripts_styles() {
 			if ( file_exists( SM_PATH . 'assets/css/theme-specific/' . get_option( 'template' ) . '.css' ) ) {
 				wp_enqueue_style( 'wpfc-sm-style-' . get_option( 'template' ), SM_URL . 'assets/css/theme-specific/' . get_option( 'template' ) . '.css', array( 'wpfc-sm-styles' ), SM_VERSION );
 			}
+
+			do_action( 'sm_enqueue_css' );
+			do_action( 'sm_enqueue_js' );
 		}
 
 		switch ( \SermonManager::getOption( 'player' ) ) {

From 4beec28b0f28552d2532bf28e106aeffbae35730 Mon Sep 17 00:00:00 2001
From: Adrian Ionescu <9744973+adrianweb@users.noreply.github.com>
Date: Thu, 5 Jul 2018 15:15:32 +0000
Subject: [PATCH 06/22] add sermon sermons wrapper only for sm pro templates

---
 views/archive-wpfc_sermon.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/views/archive-wpfc_sermon.php b/views/archive-wpfc_sermon.php
index 9e0a248..6e10161 100644
--- a/views/archive-wpfc_sermon.php
+++ b/views/archive-wpfc_sermon.php
@@ -12,10 +12,14 @@
 <?php echo render_wpfc_sorting(); ?>
 <?php
 if ( have_posts() ) :
-	while ( have_posts() ) :
-		the_post();
-		wpfc_sermon_excerpt_v2(); // You can edit the content of this function in `partials/content-sermon-archive.php`.
-	endwhile;
+	if ( wpfc_sm_pro_is_templating_being_used() ) :
+	echo '<div class="smpro-items">';
+	    while ( have_posts() ) :
+		    the_post();
+		    wpfc_sermon_excerpt_v2(); // You can edit the content of this function in `partials/content-sermon-archive.php`.
+	    endwhile;
+	echo '</div>';
+	endif;
 	if ( function_exists( 'wp_pagenavi' ) ) :
 		wp_pagenavi();
 	else :

From 52c632cb9fc24ca6b14719a0eadfd4981bbf2716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Sat, 7 Jul 2018 23:02:53 +0200
Subject: [PATCH 07/22] Include whole changelog in changelog.txt

---
 changelog.txt | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 70016e0..73a3cca 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,51 @@
+### 2.13.2 ###
+* Fix: Excerpt meta box not showing up
+
+### 2.13.1 ###
+* New: Add `list_podcasts` shortcode (thanks @macbookandrew!)
+* New: Support for OceanWP theme (thanks @zSeriesGuy!)
+* Fix: Archive page slug not applying
+* Fix: Feed showing PHP notice in some rare cases
+* Fix: Taxonomy list/images ignoring arguments
+* Fix: Wrappers do not get overriden (thanks @zSeriesGuy!)
+
+### 2.13.0 ###
+* New: Add a simpler way of overriding sermon render
+* New: Add excerpt support (thanks @robertmain!)
+* New: Add read more link to the sermon description (thanks @robertmain!)
+* New: Add revisions support (thanks @robertmain!)
+* New: Add support for custom WP role capabilities (thanks @zSeriesGuy!)
+* New: Add support for sermon password protection
+* New: Add working file for rendering the feed
+* New: Add a tab in settings for controlling the import
+* Change: Add more options to the recent sermons widget
+* Change: Add a way to get sermon's series image
+* Change: Add an option to hide read more when it's not needed
+* Fix: Audio download button glitches sometimes
+* Fix: Custom preacher label in menu lowercased when label is in lowercase
+* Fix: Feed not validating when audio files use SSL
+* Fix: Fix spacing on Divi theme
+* Fix: Image size shortcode argument not working
+* Fix: MP4 video file being detected as YouTube and therefore not working
+* Fix: SB image import breaking when image is local and does not exist on filesystem
+* Fix: Sermon Browser services import
+* Fix: Sermon Details meta not loading under very specific circumstances
+* Fix: Sermons do not appear if published via API and "Date Preached" not set
+* Fix: Sermons not showing in shortcode under certain timezone conditions
+* Fix: Sermons menu title is "All Sermons" instead of "Sermons"
+* Fix: Shortcode pagination not working when "Plain" permalinks are used
+* Fix: Shortcodes showing in iTunes sermon description
+* Fix: Taxonomy image assignment not working
+* Fix: Title not being in the same line, even though there's enough space
+* Dev: Add a filter for filtering sermon image size
+* Dev: Add more hooks
+* Dev: Add PHPUnit configuration
+* Dev: Add support for WordPress attachment ID for sermon audio files
+* Dev: Add WPCS configuration
+* Dev: All terms now support ordering by latest sermon
+* Dev: Deprecate most of old podcasting functions
+* Dev: Refactor widgets code
+
 ### 2.12.5 ###
 * Change: Add Previous/Next sermon navigation
 * Change: Add `hide_title` parameter for `[sermon_images]` shortcode

From 012fc50595656c045905c59f19e4365c86f1bd8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Sat, 7 Jul 2018 23:25:44 +0200
Subject: [PATCH 08/22] Fix CS and logic in archive view

---
 views/archive-wpfc_sermon.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/views/archive-wpfc_sermon.php b/views/archive-wpfc_sermon.php
index 6e10161..8b2ebb9 100644
--- a/views/archive-wpfc_sermon.php
+++ b/views/archive-wpfc_sermon.php
@@ -7,19 +7,24 @@
 
 get_header(); ?>
 
-<?php echo wpfc_get_partial('content-sermon-wrapper-start'); ?>
+<?php echo wpfc_get_partial( 'content-sermon-wrapper-start' ); ?>
 
 <?php echo render_wpfc_sorting(); ?>
 <?php
 if ( have_posts() ) :
-	if ( wpfc_sm_pro_is_templating_being_used() ) :
-	echo '<div class="smpro-items">';
-	    while ( have_posts() ) :
-		    the_post();
-		    wpfc_sermon_excerpt_v2(); // You can edit the content of this function in `partials/content-sermon-archive.php`.
-	    endwhile;
-	echo '</div>';
+	if ( function_exists( 'wpfc_sm_pro_is_templating_being_used' ) && wpfc_sm_pro_is_templating_being_used() ) :
+		echo '<div class="smpro-items">';
 	endif;
+
+	while ( have_posts() ) :
+		the_post();
+		wpfc_sermon_excerpt_v2(); // You can edit the content of this function in `partials/content-sermon-archive.php`.
+	endwhile;
+
+	if ( function_exists( 'wpfc_sm_pro_is_templating_being_used' ) && wpfc_sm_pro_is_templating_being_used() ) :
+		echo '</div>';
+	endif;
+
 	if ( function_exists( 'wp_pagenavi' ) ) :
 		wp_pagenavi();
 	else :
@@ -30,7 +35,7 @@
 endif;
 ?>
 
-<?php echo wpfc_get_partial('content-sermon-wrapper-end'); ?>
+<?php echo wpfc_get_partial( 'content-sermon-wrapper-end' ); ?>
 
 <?php
 get_footer();

From c0ecc084a6f58e0a2dfeb03178ae4580906921ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Tue, 10 Jul 2018 03:00:43 +0200
Subject: [PATCH 09/22] Silence importing database check errors

---
 includes/admin/import/class-sm-import-sb.php | 2 +-
 includes/admin/import/class-sm-import-se.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/admin/import/class-sm-import-sb.php b/includes/admin/import/class-sm-import-sb.php
index 6bcf0f3..cf6f389 100644
--- a/includes/admin/import/class-sm-import-sb.php
+++ b/includes/admin/import/class-sm-import-sb.php
@@ -79,7 +79,7 @@ public function __construct() {
 	public static function is_installed() {
 		global $wpdb;
 
-		return $wpdb->query( "SELECT id FROM {$wpdb->prefix}sb_sermons LIMIT 1 " ) !== false;
+		return @$wpdb->query( "SELECT id FROM {$wpdb->prefix}sb_sermons LIMIT 1 " ) !== false;
 	}
 
 	/**
diff --git a/includes/admin/import/class-sm-import-se.php b/includes/admin/import/class-sm-import-se.php
index f7ebdec..24896fc 100644
--- a/includes/admin/import/class-sm-import-se.php
+++ b/includes/admin/import/class-sm-import-se.php
@@ -49,7 +49,7 @@ class SM_Import_SE {
 	public static function is_installed() {
 		global $wpdb;
 
-		return $wpdb->query( "SELECT * FROM {$wpdb->prefix}se_messages LIMIT 1 " ) !== false;
+		return @$wpdb->query( "SELECT * FROM {$wpdb->prefix}se_messages LIMIT 1 " ) !== false;
 	}
 
 	/**

From 9f146f5db1bfdc0246456bf221953e86742cc6bd Mon Sep 17 00:00:00 2001
From: Adrian Ionescu <9744973+adi8i@users.noreply.github.com>
Date: Thu, 12 Jul 2018 20:40:45 +0300
Subject: [PATCH 10/22] Add layout columns

---
 views/archive-wpfc_sermon.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/views/archive-wpfc_sermon.php b/views/archive-wpfc_sermon.php
index 8b2ebb9..706921d 100644
--- a/views/archive-wpfc_sermon.php
+++ b/views/archive-wpfc_sermon.php
@@ -13,6 +13,11 @@
 <?php
 if ( have_posts() ) :
 	if ( function_exists( 'wpfc_sm_pro_is_templating_being_used' ) && wpfc_sm_pro_is_templating_being_used() ) :
+                // Get SM PRO settings
+                $smpro_settings = \SermonManagerPro\Templating\Settings::get_settings();
+                $smpro_layout_columns = $smpro_settings['layout_columns'];
+
+                echo '<style>.smpro-items {--smpro-layout-columns: '. $smpro_layout_columns .'}</style>';
 		echo '<div class="smpro-items">';
 	endif;
 

From 82bfa54da770e52250e2b3ad099c18de55a0b72a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Wed, 18 Jul 2018 12:29:10 +0200
Subject: [PATCH 11/22] Use native player in Safari

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

diff --git a/readme.txt b/readme.txt
index e0e8410..b667c87 100755
--- a/readme.txt
+++ b/readme.txt
@@ -105,6 +105,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 ## Changelog ##
 ### 2.13.2 ###
 * Fix: Excerpt meta box not showing up
+* Change: Use native player in Safari
 
 ### 2.13.1 ###
 * New: Add `list_podcasts` shortcode (thanks @macbookandrew!)
diff --git a/sermons.php b/sermons.php
index deeb1b8..65f083c 100755
--- a/sermons.php
+++ b/sermons.php
@@ -496,7 +496,7 @@ public static function enqueue_scripts_styles() {
 			case 'plyr':
 				wp_enqueue_script( 'wpfc-sm-plyr' );
 				wp_enqueue_style( 'wpfc-sm-plyr-css' );
-				wp_add_inline_script( 'wpfc-sm-plyr', "window.addEventListener('DOMContentLoaded',function(){var players=plyr.setup(document.querySelectorAll('.wpfc-sermon-player,.wpfc-sermon-video-player'),{\"debug\": " . ( defined( 'WP_DEBUG' ) && WP_DEBUG === true ? 'true' : 'false' ) . "});for(var p in players){if(players.hasOwnProperty(p)){players[p].on('loadedmetadata ready',function(event){if(typeof this.firstChild.dataset.plyr_seek !== 'undefined'){var instance=event.detail.plyr;instance.seek(parseInt(this.firstChild.dataset.plyr_seek));}});}}})" );
+				wp_add_inline_script( 'wpfc-sm-plyr', "window.addEventListener('DOMContentLoaded',function(){var players=plyr.setup(document.querySelectorAll('.wpfc-sermon-player,.wpfc-sermon-video-player'),{debug: " . ( defined( 'WP_DEBUG' ) && WP_DEBUG === true ? 'true' : 'false' ) . ", enabled: ! /Safari/.test(navigator.userAgent) || (/Safari/.test(navigator.userAgent) && /Chrome|OPR/.test(navigator.userAgent))});for(var p in players){if(players.hasOwnProperty(p)){players[p].on('loadedmetadata ready',function(event){if(typeof this.firstChild.dataset.plyr_seek !== 'undefined'){var instance=event.detail.plyr;instance.seek(parseInt(this.firstChild.dataset.plyr_seek));}});}}})" );
 
 				break;
 		}

From 83edef788fb59599529b3c2aa616cd896addcf5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Wed, 18 Jul 2018 18:54:54 +0200
Subject: [PATCH 12/22] Separate preached and published dates in admin view

---
 includes/admin/class-sm-admin-post-types.php | 72 +++-----------------
 readme.txt                                   |  1 +
 2 files changed, 10 insertions(+), 63 deletions(-)

diff --git a/includes/admin/class-sm-admin-post-types.php b/includes/admin/class-sm-admin-post-types.php
index 6526794..75a75e2 100644
--- a/includes/admin/class-sm-admin-post-types.php
+++ b/includes/admin/class-sm-admin-post-types.php
@@ -99,11 +99,10 @@ public function sermon_columns( $existing_columns ) {
 		$columns['topics']   = __( 'Topics', 'sermon-manager-for-wordpress' );
 		$columns['views']    = __( 'Views', 'sermon-manager-for-wordpress' );
 		$columns['comments'] = $existing_columns['comments'];
-		$columns['preached'] = __( 'Date' );
+		$columns['preached'] = __( 'Preached', 'sermon-manager-for-wordpress' );
+		$columns['date']     = __( 'Published' );
 
-		unset( $existing_columns['date'] );
-
-		return array_merge( $columns, $existing_columns );
+		return $columns + $existing_columns;
 	}
 
 	/**
@@ -132,69 +131,16 @@ public function render_sermon_columns( $column ) {
 				$data = wpfc_entry_views_get( array( 'post_id' => $post->ID ) );
 				break;
 			case 'preached':
-				/**
-				 * Modified from code in wp-admin/includes/class-wp-posts-list-table.php
-				 */
-				global $mode;
-
-				$data = '';
-
-				if ( '0000-00-00 00:00:00' === $post->post_date ) {
-					$t_time    = __( 'Unpublished' );
-					$h_time    = __( 'Unpublished' );
-					$time_diff = 0;
-				} else {
-					$t_time = sm_get_the_date( __( 'Y/m/d g:i:s a' ) );
-					$m_time = sm_get_the_date( 'Y-m-d H:i:s' );
-					$time   = sm_get_the_date( 'U' );
-
-					$time_diff = time() - $time;
-
-					if ( $time_diff > 0 && $time_diff < DAY_IN_SECONDS ) {
-						// translators: %s: The time. Such as "12 hours".
-						$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
-					} else {
-						$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
-					}
-				}
+				$unix_preached = SM_Dates::get( 'U' );
 
-				if ( 'publish' === $post->post_status ) {
-					$status = __( 'Published' );
-				} elseif ( 'future' === $post->post_status ) {
-					if ( $time_diff > 0 ) {
-						$status = '<strong class="error-message">' . __( 'Missed schedule' ) . '</strong>';
-					} else {
-						$status = __( 'Scheduled' );
-					}
+				if ( time() - $unix_preached < DAY_IN_SECONDS ) {
+					// translators: %s: The time. Such as "12 hours".
+					$data = sprintf( __( '%s ago' ), human_time_diff( $unix_preached ) );
 				} else {
-					$status = __( 'Last Modified' );
+					$data = date( 'Y/m/d', $unix_preached );
 				}
 
-				if ( $status ) {
-					$data .= $status . '<br />';
-				}
-
-				if ( 'excerpt' === $mode ) {
-					/**
-					 * Filters the published time of the post.
-					 *
-					 * If `$mode` equals 'excerpt', the published time and date are both displayed.
-					 * If `$mode` equals 'list' (default), the publish date is displayed, with the
-					 * time and date together available as an abbreviation definition.
-					 *
-					 * @since 2.9
-					 *
-					 * @param string  $t_time      The published time.
-					 * @param WP_Post $post        Post object.
-					 * @param string  $column_name The column name.
-					 * @param string  $mode        The list display mode ('excerpt' or 'list').
-					 */
-					$data .= apply_filters( 'wpfc_sermon_preached_column_time', $t_time, $post, 'date', $mode );
-				} else {
-
-					/** This filter is documented above */
-					$data .= '<abbr title="' . $t_time . '">' . apply_filters( 'wpfc_sermon_preached_column_time', $h_time, $post, 'date', $mode ) . '</abbr>';
-				}
+				$data = '<abbr title="' . date( 'Y/m/d g:i:s a', $unix_preached ) . '">' . $data . '</abbr>';
 
 				break;
 			default:
diff --git a/readme.txt b/readme.txt
index b667c87..1a15ccf 100755
--- a/readme.txt
+++ b/readme.txt
@@ -106,6 +106,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 ### 2.13.2 ###
 * Fix: Excerpt meta box not showing up
 * Change: Use native player in Safari
+* Change: Separate "Preached" and "Published" dates in admin view
 
 ### 2.13.1 ###
 * New: Add `list_podcasts` shortcode (thanks @macbookandrew!)

From 90c257e7ee6d7a0963bea031ac1f38c13c0fa140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Fri, 20 Jul 2018 00:43:11 +0200
Subject: [PATCH 13/22] Add an option to show date "Published" instead of date
 "Preached" in feed and frontend

---
 includes/admin/settings/class-sm-settings-debug.php | 6 ++++++
 includes/class-sm-dates-wp.php                      | 2 +-
 readme.txt                                          | 1 +
 views/partials/content-sermon-archive.php           | 6 +++++-
 views/partials/content-sermon-single.php            | 6 +++++-
 views/wpfc-podcast-feed.php                         | 4 +++-
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/includes/admin/settings/class-sm-settings-debug.php b/includes/admin/settings/class-sm-settings-debug.php
index 66208e8..1f3e122 100644
--- a/includes/admin/settings/class-sm-settings-debug.php
+++ b/includes/admin/settings/class-sm-settings-debug.php
@@ -106,6 +106,12 @@ public function get_settings() {
 				'id'      => 'disable_layouts',
 				'default' => 0,
 			),
+			array(
+				'title'   => 'Use date "Published" instead of date "Preached" in feed and frontend view',
+				'type'    => 'checkbox',
+				'id'      => 'use_published_date',
+				'default' => 0,
+			),
 
 			array(
 				'type' => 'sectionend',
diff --git a/includes/class-sm-dates-wp.php b/includes/class-sm-dates-wp.php
index 9e859ab..e8a52a0 100644
--- a/includes/class-sm-dates-wp.php
+++ b/includes/class-sm-dates-wp.php
@@ -50,7 +50,7 @@ public static function hook() {
 		/**
 		 * Exit if disabled.
 		 */
-		if ( apply_filters( 'sm_dates_wp', true ) === false ) {
+		if ( apply_filters( 'sm_dates_wp', true ) === false || SermonManager::getOption( 'use_published_date' ) ) {
 			return;
 		}
 
diff --git a/readme.txt b/readme.txt
index 1a15ccf..e1ca88a 100755
--- a/readme.txt
+++ b/readme.txt
@@ -104,6 +104,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 
 ## Changelog ##
 ### 2.13.2 ###
+* New: Add an option to show date "Published" instead of date "Preached" in feed and frontend
 * Fix: Excerpt meta box not showing up
 * Change: Use native player in Safari
 * Change: Separate "Preached" and "Published" dates in admin view
diff --git a/views/partials/content-sermon-archive.php b/views/partials/content-sermon-archive.php
index f6bb771..42cf5e3 100644
--- a/views/partials/content-sermon-archive.php
+++ b/views/partials/content-sermon-archive.php
@@ -48,7 +48,11 @@
 						</h3>
 					<?php endif; ?>
 					<div class="wpfc-sermon-meta-item wpfc-sermon-meta-date">
-						<?php sm_the_date(); ?>
+						<?php if ( SermonManager::getOption( 'use_published_date' ) ) : ?>
+							<?php the_date(); ?>
+						<?php else : ?>
+							<?php echo SM_Dates::get(); ?>
+						<?php endif; ?>
 					</div>
 				</div>
 				<?php if ( \SermonManager::getOption( 'archive_meta' ) ) : ?>
diff --git a/views/partials/content-sermon-single.php b/views/partials/content-sermon-single.php
index 1603714..37809ce 100644
--- a/views/partials/content-sermon-single.php
+++ b/views/partials/content-sermon-single.php
@@ -30,7 +30,11 @@
 		<div class="wpfc-sermon-single-main">
 			<div class="wpfc-sermon-single-header">
 				<div class="wpfc-sermon-single-meta-item wpfc-sermon-single-meta-date">
-					<?php sm_the_date(); ?>
+					<?php if ( SermonManager::getOption( 'use_published_date' ) ) : ?>
+						<?php the_date(); ?>
+					<?php else : ?>
+						<?php echo SM_Dates::get(); ?>
+					<?php endif; ?>
 				</div>
 				<?php if ( ! \SermonManager::getOption( 'theme_compatibility' ) ) : ?>
 					<h2 class="wpfc-sermon-single-title"><?php the_title(); ?></h2>
diff --git a/views/wpfc-podcast-feed.php b/views/wpfc-podcast-feed.php
index 1d22cbc..7953bd9 100644
--- a/views/wpfc-podcast-feed.php
+++ b/views/wpfc-podcast-feed.php
@@ -156,6 +156,8 @@
 				$audio_file_size = get_post_meta( $post->ID, '_wpfc_sermon_size', 'true' ) ?: 0;
 				$description     = strip_shortcodes( get_post_meta( 'sermon_description' ) );
 				$description     = str_replace( '&nbsp;', '', \SermonManager::getOption( 'enable_podcast_html_description' ) ? stripslashes( wpautop( wp_filter_kses( $description ) ) ) : stripslashes( wp_filter_nohtml_kses( $description ) ) );
+				$date_preached   = SM_Dates::get( 'D, d M Y H:i:s +0000' );
+				$date_published  = get_the_date( 'D, d M Y H:i:s +0000', $post->ID );
 
 				// Fix for relative audio file URLs.
 				if ( substr( $audio, 0, 1 ) === '/' ) {
@@ -178,7 +180,7 @@
 						<comments><?php comments_link_feed(); ?></comments>
 					<?php endif; ?>
 
-					<pubDate><?php echo SM_Dates::get( 'D, d M Y H:i:s +0000' ); ?></pubDate>
+					<pubDate><?php echo SermonManager::getOption( 'use_published_date' ) ? $date_published : $date_preached; ?></pubDate>
 					<dc:creator><![CDATA[<?php echo esc_html( $speaker ); ?>]]></dc:creator>
 					<?php the_category_rss( 'rss2' ); ?>
 

From ed00e549318a58dcaed22ce1378e43a446f85858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Fri, 20 Jul 2018 01:38:21 +0200
Subject: [PATCH 14/22] Fix description not showing in podcast feed

---
 includes/sm-template-functions.php       | 20 +++++++++++++++-----
 readme.txt                               |  1 +
 views/partials/content-sermon-single.php |  2 +-
 views/wpfc-podcast-feed.php              |  3 ++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/includes/sm-template-functions.php b/includes/sm-template-functions.php
index cdec54b..0ad6ce9 100755
--- a/includes/sm-template-functions.php
+++ b/includes/sm-template-functions.php
@@ -227,15 +227,16 @@ function wpfc_sermon_description( $before = '', $after = '', $return = false ) {
 /**
  * Renders the video player.
  *
- * @param string $url  The URL of the video file.
- * @param int    $seek Allows seeking to specific second in audio file.
+ * @param string   $url  The URL of the video file.
+ * @param int|bool $seek Allows seeking to specific second in audio file. Pass an int to override auto detection or
+ *                       false to disable auto detection.
  *
  * @since 2.11.0
  * @since 2.12.3 added $seek
  *
  * @return string Video player HTML.
  */
-function wpfc_render_video( $url = '', $seek = null ) {
+function wpfc_render_video( $url = '', $seek = true ) {
 	if ( ! is_string( $url ) || trim( $url ) === '' ) {
 		return '';
 	}
@@ -265,11 +266,20 @@ function wpfc_render_video( $url = '', $seek = null ) {
 		$extra_settings   = '';
 		$output           = '';
 
-		if ( is_numeric( $seek ) ) {
+		if ( is_numeric( $seek ) || true === $seek ) {
+			if ( is_numeric( $seek ) ) {
+				$seconds = $seek;
+			} else {
+				$seconds = wpfc_get_media_url_seconds( $url );
+			}
+
 			// Sanitation just in case.
-			$extra_settings = 'data-plyr_seek=\'' . intval( $seek ) . '\'';
+			$extra_settings = 'data-plyr_seek=\'' . intval( $seconds ) . '\'';
 		}
 
+		// Remove seek from URL.
+		$url = preg_replace( '/\?|#t.*$/', '', $url );
+
 		if ( 'plyr' === $player && ( $is_youtube || $is_vimeo ) ) {
 			$output .= '<div data-type="' . ( $is_youtube ? 'youtube' : 'vimeo' ) . '" data-video-id="' . $url . '" class="wpfc-sermon-video-player video-' . ( $is_youtube ? 'youtube' : 'vimeo' ) . ( 'mediaelement' === $player ? 'mejs__player' : '' ) . '" ' . $extra_settings . '></div>';
 		} else {
diff --git a/readme.txt b/readme.txt
index e1ca88a..59b1912 100755
--- a/readme.txt
+++ b/readme.txt
@@ -106,6 +106,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 ### 2.13.2 ###
 * New: Add an option to show date "Published" instead of date "Preached" in feed and frontend
 * Fix: Excerpt meta box not showing up
+* Fix: Fix description not showing in the podcast feed
 * Change: Use native player in Safari
 * Change: Separate "Preached" and "Published" dates in admin view
 
diff --git a/views/partials/content-sermon-single.php b/views/partials/content-sermon-single.php
index 37809ce..b722166 100644
--- a/views/partials/content-sermon-single.php
+++ b/views/partials/content-sermon-single.php
@@ -73,7 +73,7 @@
 			<div class="wpfc-sermon-single-media">
 				<?php if ( get_wpfc_sermon_meta( 'sermon_video_link' ) ) : ?>
 					<div class="wpfc-sermon-single-video wpfc-sermon-single-video-link">
-						<?php echo wpfc_render_video( get_wpfc_sermon_meta( 'sermon_video_link' ), wpfc_get_media_url_seconds( get_wpfc_sermon_meta( 'sermon_video_link' ) ) ); ?>
+						<?php echo wpfc_render_video( get_wpfc_sermon_meta( 'sermon_video_link' ) ); ?>
 					</div>
 				<?php endif; ?>
 				<?php if ( get_wpfc_sermon_meta( 'sermon_video' ) ) : ?>
diff --git a/views/wpfc-podcast-feed.php b/views/wpfc-podcast-feed.php
index 7953bd9..f41daed 100644
--- a/views/wpfc-podcast-feed.php
+++ b/views/wpfc-podcast-feed.php
@@ -154,7 +154,7 @@
 				$post_image      = str_ireplace( 'https://', 'http://', ! empty( $post_image['0'] ) ? $post_image['0'] : '' );
 				$audio_duration  = get_post_meta( $post->ID, '_wpfc_sermon_duration', true ) ?: '0:00';
 				$audio_file_size = get_post_meta( $post->ID, '_wpfc_sermon_size', 'true' ) ?: 0;
-				$description     = strip_shortcodes( get_post_meta( 'sermon_description' ) );
+				$description     = strip_shortcodes( get_post_meta( $post->ID, 'sermon_description', true ) );
 				$description     = str_replace( '&nbsp;', '', \SermonManager::getOption( 'enable_podcast_html_description' ) ? stripslashes( wpautop( wp_filter_kses( $description ) ) ) : stripslashes( wp_filter_nohtml_kses( $description ) ) );
 				$date_preached   = SM_Dates::get( 'D, d M Y H:i:s +0000' );
 				$date_published  = get_the_date( 'D, d M Y H:i:s +0000', $post->ID );
@@ -187,6 +187,7 @@
 					<guid isPermaLink="false"><?php the_guid(); ?></guid>
 					<description><![CDATA[<?php echo $description; ?>]]></description>
 					<content:encoded><![CDATA[<?php echo $description; ?>]]></content:encoded>
+					<itunes:summary><![CDATA[<?php echo $description; ?>]]></itunes:summary>
 
 					<itunes:author><?php echo esc_html( $speakers ); ?></itunes:author>
 					<itunes:subtitle><?php echo esc_html( $series ); ?></itunes:subtitle>

From 186e0070f2c37ee380bf7efd34d765c1f1ca37d0 Mon Sep 17 00:00:00 2001
From: Adrian Ionescu <9744973+adrianweb@users.noreply.github.com>
Date: Fri, 3 Aug 2018 12:22:35 +0000
Subject: [PATCH 15/22] add x theme support

---
 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 3825eb3..59d48e3 100644
--- a/views/partials/content-sermon-wrapper-end.php
+++ b/views/partials/content-sermon-wrapper-end.php
@@ -75,6 +75,11 @@
 		get_sidebar();
 		echo '</div><!-- end of #content-wrap -->';
 		break;
+	case 'x':
+		echo '</div>';
+		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 33bb614..a22764e 100644
--- a/views/partials/content-sermon-wrapper-start.php
+++ b/views/partials/content-sermon-wrapper-start.php
@@ -52,6 +52,9 @@
 	case 'oceanwp':
 		echo '<div id="content-wrap" class="container clr"><div id="primary" class="content-area clr"><div id="content" class="site-content clr">';
 		break;
+	case 'x':
+		echo '<div class="x-container max width offset"><div class="x-main left" role="main">';
+		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">' );
 		break;

From 336cdcf9be1ceeaa567aadf8a071eb20158bcc88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Mon, 6 Aug 2018 16:25:18 +0200
Subject: [PATCH 16/22] Fix memory leak during getting of next/previous sermon

---
 includes/sm-core-functions.php | 44 +++++-----------------------------
 1 file changed, 6 insertions(+), 38 deletions(-)

diff --git a/includes/sm-core-functions.php b/includes/sm-core-functions.php
index 27960e9..fed0f97 100644
--- a/includes/sm-core-functions.php
+++ b/includes/sm-core-functions.php
@@ -783,30 +783,14 @@ function sm_get_previous_sermon( $post = null ) {
 		_doing_it_wrong( __FUNCTION__, '$post must be an instance of WP_Post.', '2.12.5' );
 	}
 
-	$current_sermon_id = $post->ID;
-
-	$query = new WP_Query( array(
-		'post_type'      => 'wpfc_sermon',
-		'meta_key'       => 'sermon_date',
-		'meta_value_num' => time(),
-		'meta_compare'   => '<=',
-		'orderby'        => 'meta_value_num',
-		'order'          => 'DESC',
-		'posts_per_page' => - 1,
-	) );
-
-	for ( $p = 0; $p < count( $query->posts ); $p ++ ) {
-		if ( $query->posts[ $p ]->ID === $current_sermon_id ) {
-			$the_post = isset( $query->posts[ $p - 1 ] ) ? $query->posts[ $p - 1 ] : null;
-		}
-	}
+	$the_post = get_previous_post();
 
 	/**
 	 * Allows to filter the return value.
 	 *
 	 * @param $the_post WP_Post|null The post if found.
 	 */
-	return apply_filters( 'sm_get_previous_sermon', isset( $the_post ) ? $the_post : null );
+	return apply_filters( 'sm_get_previous_sermon', empty( $the_post ) ? null : $the_post );
 }
 
 /**
@@ -819,38 +803,22 @@ function sm_get_previous_sermon( $post = null ) {
  * @return WP_Post|null The sermon if found, null otherwise.
  */
 function sm_get_next_sermon( $post = null ) {
-	if ( $post === null ) {
+	if ( null === $post ) {
 		global $post;
 	}
 
-	if ( ! $post instanceof WP_Post || $post->post_type !== 'wpfc_sermon' ) {
+	if ( ! $post instanceof WP_Post || 'wpfc_sermon' !== $post->post_type ) {
 		_doing_it_wrong( __FUNCTION__, '$post must be an instance of WP_Post.', '2.12.5' );
 	}
 
-	$current_sermon_id = $post->ID;
-
-	$query = new WP_Query( array(
-		'post_type'      => 'wpfc_sermon',
-		'meta_key'       => 'sermon_date',
-		'meta_value_num' => time(),
-		'meta_compare'   => '<=',
-		'orderby'        => 'meta_value_num',
-		'order'          => 'DESC',
-		'posts_per_page' => - 1,
-	) );
-
-	for ( $p = 0; $p < count( $query->posts ); $p ++ ) {
-		if ( $query->posts[ $p ]->ID === $current_sermon_id ) {
-			$the_post = isset( $query->posts[ $p + 1 ] ) ? $query->posts[ $p + 1 ] : null;
-		}
-	}
+	$the_post = get_next_post();
 
 	/**
 	 * Allows to filter the return value.
 	 *
 	 * @param $the_post WP_Post|null The post if found.
 	 */
-	return apply_filters( 'sm_get_next_sermon', isset( $the_post ) ? $the_post : null );
+	return apply_filters( 'sm_get_next_sermon', empty( $the_post ) ? null : $the_post );
 }
 
 /**

From 35f2f06a114e087347e0ebd5fdad45b190483087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Mon, 6 Aug 2018 16:25:46 +0200
Subject: [PATCH 17/22] Update header in view files to be more precise

---
 views/partials/content-sermon-archive.php     | 2 +-
 views/partials/content-sermon-attachments.php | 2 +-
 views/partials/content-sermon-filtering.php   | 2 +-
 views/partials/content-sermon-single.php      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/partials/content-sermon-archive.php b/views/partials/content-sermon-archive.php
index 42cf5e3..06668c3 100644
--- a/views/partials/content-sermon-archive.php
+++ b/views/partials/content-sermon-archive.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * To edit this file, please copy the contents of this file to either:
+ * To edit this file, please copy the contents of this file to one of these locations:
  * - `/wp-content/themes/<your_theme>/partials/content-sermon-archive.php`
  * - `/wp-content/themes/<your_theme>/template-parts/content-sermon-archive.php`
  * - `/wp-content/themes/<your_theme>/content-sermon-archive.php`
diff --git a/views/partials/content-sermon-attachments.php b/views/partials/content-sermon-attachments.php
index 265d5f6..ab63973 100644
--- a/views/partials/content-sermon-attachments.php
+++ b/views/partials/content-sermon-attachments.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * To edit this file, please copy the contents of this file to
+ * To edit this file, please copy the contents of this file to one of these locations:
  * - `/wp-content/themes/<your_theme>/partials/content-sermon-attachments.php`
  * - `/wp-content/themes/<your_theme>/template-parts/content-sermon-attachments.php`
  * - `/wp-content/themes/<your_theme>/content-sermon-attachments.php`
diff --git a/views/partials/content-sermon-filtering.php b/views/partials/content-sermon-filtering.php
index 7754239..c67c233 100644
--- a/views/partials/content-sermon-filtering.php
+++ b/views/partials/content-sermon-filtering.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * To edit this file, please copy the contents of this file to
+ * To edit this file, please copy the contents of this file to one of these locations:
  * - `/wp-content/themes/<your_theme>/partials/content-sermon-filtering.php`
  * - `/wp-content/themes/<your_theme>/template-parts/content-sermon-filtering.php`
  * - `/wp-content/themes/<your_theme>/content-sermon-filtering.php`
diff --git a/views/partials/content-sermon-single.php b/views/partials/content-sermon-single.php
index b722166..56e34a1 100644
--- a/views/partials/content-sermon-single.php
+++ b/views/partials/content-sermon-single.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * To edit this file, please copy the contents of this file to
+ * To edit this file, please copy the contents of this file to one of these locations:
  * - `/wp-content/themes/<your_theme>/partials/content-sermon-single.php`
  * - `/wp-content/themes/<your_theme>/template-parts/content-sermon-single.php`
  * - `/wp-content/themes/<your_theme>/content-sermon-single.php`

From 6cdac62a6b75fa6f5e16f1bea29b01a7713517c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Mon, 6 Aug 2018 16:26:09 +0200
Subject: [PATCH 18/22] Move SM after plugin load action at the end of the
 actions

---
 sermons.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sermons.php b/sermons.php
index 65f083c..c6e2850 100755
--- a/sermons.php
+++ b/sermons.php
@@ -235,8 +235,6 @@ public function __construct() {
 			return 'no';
 		} );
 
-		do_action( 'sm_after_plugin_load' );
-
 		add_action( 'sm_admin_settings_sanitize_option_post_content_enabled', function ( $value ) {
 			$value = intval( $value );
 
@@ -267,6 +265,8 @@ public function __construct() {
 
 			return $value;
 		} );
+
+		do_action( 'sm_after_plugin_load' );
 	}
 
 	/**

From 655d379ae4073ba008c7d71e2db62de20295d4be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Mon, 6 Aug 2018 16:26:44 +0200
Subject: [PATCH 19/22] Update changelog

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

diff --git a/readme.txt b/readme.txt
index 59b1912..304996e 100755
--- a/readme.txt
+++ b/readme.txt
@@ -107,6 +107,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 * New: Add an option to show date "Published" instead of date "Preached" in feed and frontend
 * Fix: Excerpt meta box not showing up
 * Fix: Fix description not showing in the podcast feed
+* Fix: Fix memory leak when site has big number of sermons
 * Change: Use native player in Safari
 * Change: Separate "Preached" and "Published" dates in admin view
 

From 9f9b12633239c841668212e3883234ee45cefdd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Mon, 6 Aug 2018 16:36:01 +0200
Subject: [PATCH 20/22] Use non-localized dates in the RSS feed

---
 includes/class-sm-dates.php | 5 +++--
 readme.txt                  | 1 +
 views/wpfc-podcast-feed.php | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/includes/class-sm-dates.php b/includes/class-sm-dates.php
index a88f187..3252960 100644
--- a/includes/class-sm-dates.php
+++ b/includes/class-sm-dates.php
@@ -28,10 +28,11 @@ class SM_Dates {
 	 * @param bool        $force_unix_sanitation Optional. Sanitation is done only if Sermon Manager is older than 2.6,
 	 *                                           we are assuming that newer (2.6>) Sermon Manager versions will save
 	 *                                           the date as Unix timestamp so sanitation is not required.
+	 * @param bool        $localize              If set to false, it will skip date localization. Default true.
 	 *
 	 * @return string|false Date when sermon was preached. False on failure.
 	 */
-	public static function get( $format = '', $post = null, $force_unix_sanitation = false ) {
+	public static function get( $format = '', $post = null, $force_unix_sanitation = false, $localize = true ) {
 		// Reset the variable.
 		$has_time  = false;
 		$sanitized = false;
@@ -99,7 +100,7 @@ public static function get( $format = '', $post = null, $force_unix_sanitation =
 		}
 
 		// Format it.
-		$date = date_i18n( $format, $date );
+		$date = $localize ? date_i18n( $format, $date ) : date( $format, $date );
 
 		/**
 		 * Filters the date a post was preached
diff --git a/readme.txt b/readme.txt
index 304996e..785fcf8 100755
--- a/readme.txt
+++ b/readme.txt
@@ -108,6 +108,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 * Fix: Excerpt meta box not showing up
 * Fix: Fix description not showing in the podcast feed
 * Fix: Fix memory leak when site has big number of sermons
+* Fix: Use non-localized dates in the RSS feed
 * Change: Use native player in Safari
 * Change: Separate "Preached" and "Published" dates in admin view
 
diff --git a/views/wpfc-podcast-feed.php b/views/wpfc-podcast-feed.php
index f41daed..f08dadc 100644
--- a/views/wpfc-podcast-feed.php
+++ b/views/wpfc-podcast-feed.php
@@ -156,7 +156,7 @@
 				$audio_file_size = get_post_meta( $post->ID, '_wpfc_sermon_size', 'true' ) ?: 0;
 				$description     = strip_shortcodes( get_post_meta( $post->ID, 'sermon_description', true ) );
 				$description     = str_replace( '&nbsp;', '', \SermonManager::getOption( 'enable_podcast_html_description' ) ? stripslashes( wpautop( wp_filter_kses( $description ) ) ) : stripslashes( wp_filter_nohtml_kses( $description ) ) );
-				$date_preached   = SM_Dates::get( 'D, d M Y H:i:s +0000' );
+				$date_preached   = SM_Dates::get( 'D, d M Y H:i:s +0000', null, false, false );
 				$date_published  = get_the_date( 'D, d M Y H:i:s +0000', $post->ID );
 
 				// Fix for relative audio file URLs.

From c54e717b4918c64442a09b14ab64ae8eac609ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Mon, 6 Aug 2018 18:44:03 +0200
Subject: [PATCH 21/22] Fix issues with Sermon Browser importing

---
 .../css/admin-partials/_add-edit-sermon.scss  |   8 ++
 assets/css/admin.min.css                      |   2 +-
 assets/css/admin.min.css.map                  |   2 +-
 includes/admin/import/class-sm-import-sb.php  | 104 +++++++++++++-----
 .../includes/types/CMB2_Type_Text_Date.php    |   1 +
 readme.txt                                    |   5 +-
 6 files changed, 93 insertions(+), 29 deletions(-)

diff --git a/assets/css/admin-partials/_add-edit-sermon.scss b/assets/css/admin-partials/_add-edit-sermon.scss
index f398d7b..aceb4da 100644
--- a/assets/css/admin-partials/_add-edit-sermon.scss
+++ b/assets/css/admin-partials/_add-edit-sermon.scss
@@ -1,3 +1,11 @@
 #sermon_video_link {
   width: 25em;
+}
+
+#sermon_date {
+  width: 125px;
+
+  &::placeholder{
+    color: #ccc;
+  }
 }
\ No newline at end of file
diff --git a/assets/css/admin.min.css b/assets/css/admin.min.css
index 7465973..6cca6ed 100644
--- a/assets/css/admin.min.css
+++ b/assets/css/admin.min.css
@@ -1,2 +1,2 @@
-body.edit-php.post-type-wpfc_sermon .fixed .column-preacher,body.edit-php.post-type-wpfc_sermon .fixed .column-preached{width:10%}body.edit-php.post-type-wpfc_sermon .fixed .column-series,body.edit-php.post-type-wpfc_sermon .fixed .column-topics{width:15%}body.edit-php.post-type-wpfc_sermon .fixed .column-views{width:7%}body.wpfc_sermon_page_sm-settings .wp-heading-inline{margin-bottom:5px}body.wpfc_sermon_page_sm-settings .settings-main{display:flex;margin-top:5px}body.wpfc_sermon_page_sm-settings .settings-content{width:100%}body.wpfc_sermon_page_sm-settings .settings-content #mainform{border:1px solid #e8e8e8}body.wpfc_sermon_page_sm-settings .settings-content span.description{display:block;margin-top:5px}body.wpfc_sermon_page_sm-settings .settings-content input[type=text],body.wpfc_sermon_page_sm-settings .settings-content input[type=email]{width:100%;max-width:400px}body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper{background:white;padding:0;border-bottom:1px solid #e8e8e8}body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab{float:none;border:none;margin:0;padding:20px 20px;display:inline-block;background:none;font-weight:normal;color:#666;font-size:13px}body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab:hover,body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab:active,body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab:focus{border-bottom:2px solid #ccc;outline:none;box-shadow:none}body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab-active,body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab-active:focus,body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab-active:focus:active,body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab-active:hover{border-bottom:2px solid #4abcf0}body.wpfc_sermon_page_sm-settings .settings-content .inside{padding:.2rem 1rem .01rem 1rem;background:white}body.wpfc_sermon_page_sm-settings .settings-side{width:30%;max-width:300px;margin-left:1rem}body.wpfc_sermon_page_sm-settings .settings-side .sm-box h3{margin-left:.8rem}body.wpfc_sermon_page_sm-settings .settings-side .sm-box .description{text-align:center;font-size:0.85em;padding:0.4rem 0 0}body.wpfc_sermon_page_sm-settings .settings-side .sm-box ol{list-style-type:circle}body.wpfc_sermon_page_sm-import-export .wp-list-table{overflow:hidden;height:100%}body.wpfc_sermon_page_sm-import-export .plugin-card{position:relative}body.wpfc_sermon_page_sm-import-export .plugin-card>h2{position:absolute;left:50%;top:50%;transform:translate(-50%, -50%);z-index:1;color:#4a4a4a !important;margin:0;font-size:1.7rem;font-weight:100;letter-spacing:2px;font-family:'Roboto', sans-serif;text-transform:uppercase;opacity:0;transition:opacity .2s;cursor:default;width:100%;text-align:center}body.wpfc_sermon_page_sm-import-export .plugin-card.not-available:before{content:"";background:repeating-linear-gradient(45deg, rgba(0,0,0,0.05), rgba(0,0,0,0.05) 10px, rgba(0,0,0,0.1) 10px, rgba(0,0,0,0.1) 20px);width:100%;height:100%;position:absolute;left:0;top:0;z-index:1}body.wpfc_sermon_page_sm-import-export .plugin-card.not-available:hover>h2{opacity:1}body.wpfc_sermon_page_sm-import-export .plugin-card.not-available:hover .plugin-card-top{-webkit-filter:blur(1px);filter:blur(1px)}body.wpfc_sermon_page_sm-import-export .plugin-card.not-available *{color:#ccc}body.wpfc_sermon_page_sm-import-export .plugin-card.not-available .plugin-icon{filter:opacity(0.2)}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top{padding:0}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top:hover .import-note{display:block}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .import-note{display:none;color:rgba(0,0,0,0.5)}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .name{margin-top:20px}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .desc,body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .name{margin-left:185px}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .action-links{top:0}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .plugin-icon{font-size:5rem;color:#656565;left:0;top:0;height:168px;width:168px;margin:-20px 20px 0 0}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .plugin-icon.dashicons{margin-top:1rem}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .wp-upload-form{display:none}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .import-sniper{line-height:1;vertical-align:middle;width:13px;position:relative;top:-1px;display:none}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .import-sniper img{max-width:100%}body.post-php.post-type-wpfc_sermon #sermon_video_link{width:25em}
+body.edit-php.post-type-wpfc_sermon .fixed .column-preacher,body.edit-php.post-type-wpfc_sermon .fixed .column-preached{width:10%}body.edit-php.post-type-wpfc_sermon .fixed .column-series,body.edit-php.post-type-wpfc_sermon .fixed .column-topics{width:15%}body.edit-php.post-type-wpfc_sermon .fixed .column-views{width:7%}body.wpfc_sermon_page_sm-settings .wp-heading-inline{margin-bottom:5px}body.wpfc_sermon_page_sm-settings .settings-main{display:flex;margin-top:5px}body.wpfc_sermon_page_sm-settings .settings-content{width:100%}body.wpfc_sermon_page_sm-settings .settings-content #mainform{border:1px solid #e8e8e8}body.wpfc_sermon_page_sm-settings .settings-content span.description{display:block;margin-top:5px}body.wpfc_sermon_page_sm-settings .settings-content input[type=text],body.wpfc_sermon_page_sm-settings .settings-content input[type=email]{width:100%;max-width:400px}body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper{background:white;padding:0;border-bottom:1px solid #e8e8e8}body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab{float:none;border:none;margin:0;padding:20px 20px;display:inline-block;background:none;font-weight:normal;color:#666;font-size:13px}body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab:hover,body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab:active,body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab:focus{border-bottom:2px solid #ccc;outline:none;box-shadow:none}body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab-active,body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab-active:focus,body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab-active:focus:active,body.wpfc_sermon_page_sm-settings .settings-content .sm-nav-tab-wrapper .nav-tab-active:hover{border-bottom:2px solid #4abcf0}body.wpfc_sermon_page_sm-settings .settings-content .inside{padding:.2rem 1rem .01rem 1rem;background:white}body.wpfc_sermon_page_sm-settings .settings-side{width:30%;max-width:300px;margin-left:1rem}body.wpfc_sermon_page_sm-settings .settings-side .sm-box h3{margin-left:.8rem}body.wpfc_sermon_page_sm-settings .settings-side .sm-box .description{text-align:center;font-size:0.85em;padding:0.4rem 0 0}body.wpfc_sermon_page_sm-settings .settings-side .sm-box ol{list-style-type:circle}body.wpfc_sermon_page_sm-import-export .wp-list-table{overflow:hidden;height:100%}body.wpfc_sermon_page_sm-import-export .plugin-card{position:relative}body.wpfc_sermon_page_sm-import-export .plugin-card>h2{position:absolute;left:50%;top:50%;transform:translate(-50%, -50%);z-index:1;color:#4a4a4a !important;margin:0;font-size:1.7rem;font-weight:100;letter-spacing:2px;font-family:'Roboto', sans-serif;text-transform:uppercase;opacity:0;transition:opacity .2s;cursor:default;width:100%;text-align:center}body.wpfc_sermon_page_sm-import-export .plugin-card.not-available:before{content:"";background:repeating-linear-gradient(45deg, rgba(0,0,0,0.05), rgba(0,0,0,0.05) 10px, rgba(0,0,0,0.1) 10px, rgba(0,0,0,0.1) 20px);width:100%;height:100%;position:absolute;left:0;top:0;z-index:1}body.wpfc_sermon_page_sm-import-export .plugin-card.not-available:hover>h2{opacity:1}body.wpfc_sermon_page_sm-import-export .plugin-card.not-available:hover .plugin-card-top{-webkit-filter:blur(1px);filter:blur(1px)}body.wpfc_sermon_page_sm-import-export .plugin-card.not-available *{color:#ccc}body.wpfc_sermon_page_sm-import-export .plugin-card.not-available .plugin-icon{filter:opacity(0.2)}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top{padding:0}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top:hover .import-note{display:block}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .import-note{display:none;color:rgba(0,0,0,0.5)}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .name{margin-top:20px}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .desc,body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .name{margin-left:185px}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .action-links{top:0}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .plugin-icon{font-size:5rem;color:#656565;left:0;top:0;height:168px;width:168px;margin:-20px 20px 0 0}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .plugin-icon.dashicons{margin-top:1rem}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .wp-upload-form{display:none}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .import-sniper{line-height:1;vertical-align:middle;width:13px;position:relative;top:-1px;display:none}body.wpfc_sermon_page_sm-import-export .plugin-card .plugin-card-top .import-sniper img{max-width:100%}body.post-php.post-type-wpfc_sermon #sermon_video_link{width:25em}body.post-php.post-type-wpfc_sermon #sermon_date{width:125px}body.post-php.post-type-wpfc_sermon #sermon_date::placeholder{color:#ccc}
 /*# sourceMappingURL=admin.min.css.map */
diff --git a/assets/css/admin.min.css.map b/assets/css/admin.min.css.map
index 44da695..8da462a 100644
--- a/assets/css/admin.min.css.map
+++ b/assets/css/admin.min.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["admin-partials/_all-sermons.scss","admin-partials/_settings.scss","admin-partials/_import-export.scss","admin-partials/_add-edit-sermon.scss"],
 "names": [],
 "file": "admin.min.css"
diff --git a/includes/admin/import/class-sm-import-sb.php b/includes/admin/import/class-sm-import-sb.php
index cf6f389..89958e3 100644
--- a/includes/admin/import/class-sm-import-sb.php
+++ b/includes/admin/import/class-sm-import-sb.php
@@ -257,12 +257,15 @@ private function _import_preachers() {
 
 			if ( '' !== $preacher->image ) {
 				// Set image.
-				$media         = wp_get_upload_dir();
-				$attachment_id = sm_import_and_set_post_thumbnail( $media['baseurl'] . '/sermons/images/' . $preacher->image, 0 );
-				if ( is_int( $attachment_id ) ) {
-					$assigned_images                          = get_option( 'sermon_image_plugin' );
-					$assigned_images[ $term_data['term_id'] ] = $attachment_id;
-					update_option( 'sermon_image_plugin', $assigned_images );
+				$media = wp_get_upload_dir();
+
+				if ( file_exists( $media['basedir'] . '/sermons/images/' . $preacher->image ) ) {
+					$attachment_id = sm_import_and_set_post_thumbnail( $media['baseurl'] . '/sermons/images/' . $preacher->image, 0 );
+					if ( is_int( $attachment_id ) ) {
+						$assigned_images                          = get_option( 'sermon_image_plugin' );
+						$assigned_images[ $term_data['term_id'] ] = $attachment_id;
+						update_option( 'sermon_image_plugin', $assigned_images );
+					}
 				}
 			}
 
@@ -379,7 +382,7 @@ private function _import_sermons() {
 		$sermons = apply_filters( 'sm_import_sb_messages', $wpdb->get_results( "SELECT * FROM {$wpdb->prefix}sb_sermons" ) );
 
 		ob_start();
-		print_r( $sermons );
+		//print_r( $sermons );
 
 		$this->log( 'Raw sermon data: <a onclick="jQuery(\'#sermon-data\').toggle();" style="cursor:pointer;">Show data</a><div id="sermon-data" style="background: #f1f1f1; padding: .5rem; border: 1px solid #ccc;display:none">' . ob_get_clean() . '</div>', 0 );
 
@@ -394,6 +397,10 @@ private function _import_sermons() {
 					'comment_status' => SermonManager::getOption( 'import_disallow_comments' ) ? 'closed' : 'open',
 				) ) );
 
+				$imported[ $sermon->id ] = array(
+					'new_id' => $id,
+				);
+
 				if ( 0 === $id || $id instanceof WP_Error ) {
 					// Skip if error.
 					$this->log( 'Sermon "' . $sermon->title . '" could not be imported. (error data: ' . serialize( $id ) . ')', 2 );
@@ -402,10 +409,6 @@ private function _import_sermons() {
 					$this->log( ' • Sermon "' . $sermon->title . '" imported. (ID: ' . $imported[ $sermon->id ]['new_id'] . ')', 255 );
 				}
 
-				$imported[ $sermon->id ] = array(
-					'new_id' => $id,
-				);
-
 				/**
 				 * We write it after each insert in case that we get fatal error later.
 				 * We don't want to import sermons twice, it would be a mess.
@@ -435,29 +438,80 @@ private function _import_sermons() {
 			foreach ( $stuff as $item ) {
 				$url = $item->name;
 
-				if ( in_array( pathinfo( $url, PATHINFO_EXTENSION ), array( 'mp3', 'wav', 'ogg' ) ) ) {
-					$this->log( 'Found an audio file! ("' . $url . '")', 253 );
+				if ( 'file' === $item->type || 'url' === $item->type ) {
 					if ( parse_url( $url, PHP_URL_SCHEME ) === null ) {
 						$url = site_url( ( ! empty( $options['upload_dir'] ) ? $options['upload_dir'] : 'wp-content/uploads/sermons/' ) . rawurlencode( $url ) );
-						$this->log( 'Audio URL is local, created a full URL. ("' . $url . '")', 253 );
+						$this->log( 'File URL is local, created a full URL. ("' . $url . '")', 253 );
+					}
+
+					switch ( pathinfo( $url, PATHINFO_EXTENSION ) ) {
+						case 'mp3':
+						case 'wav':
+						case 'ogg':
+						case 'wma':
+							$this->log( 'Found an audio file! ("' . $url . '")', 253 );
+
+							update_post_meta( $id, 'sermon_audio', $url );
+							break;
+						case 'mp4':
+						case 'avi':
+						case 'wmv':
+						case 'mov':
+						case 'divx':
+							$this->log( 'Found an video file! ("' . $url . '")', 253 );
+
+							update_post_meta( $id, 'sermon_video_link', $url );
+							break;
+						case 'doc':
+						case 'docx':
+						case 'rtf':
+						case 'txt':
+							$this->log( 'Found sermon notes! ("' . $url . '")', 253 );
+
+							update_post_meta( $id, 'sermon_notes', $url );
+							break;
+						case 'ppt':
+						case 'pptx':
+						case 'pdf':
+						case 'xls':
+						case 'xlsx':
+							$this->log( 'Found sermon bulletin! ("' . $url . '")', 253 );
+
+							update_post_meta( $id, 'sermon_bulletin', $url );
+							break;
+						default:
+							if ( strpos( $url, 'vimeo.com' ) !== false ) {
+								$this->log( 'Found an video URL! ("' . $url . '")', 253 );
+
+								update_post_meta( $id, 'sermon_video_link', $url );
+								break;
+							}
 					}
+				} elseif ( 'code' === $item->type ) {
+					$this->log( 'Found video embed!', 253 );
 
-					update_post_meta( $id, 'sermon_audio', $url );
-					break;
+					update_post_meta( $id, 'sermon_video', base64_decode( $item->name ) );
 				}
 			}
 
-			// Set speaker.
-			wp_set_object_terms( $id, intval( $this->_imported_preachers[ intval( $sermon->preacher_id ) ]['new_id'] ), 'wpfc_preacher' );
-			$this->log( 'Assigned preacher with ID ' . intval( $this->_imported_preachers[ intval( $sermon->preacher_id ) ]['new_id'] ), 253 );
+			if ( ! empty( $this->_imported_preachers[ intval( $sermon->preacher_id ) ] ) ) {
+				// Set speaker.
+				wp_set_object_terms( $id, intval( $this->_imported_preachers[ intval( $sermon->preacher_id ) ]['new_id'] ), 'wpfc_preacher' );
+				$this->log( 'Assigned preacher with ID ' . intval( $this->_imported_preachers[ intval( $sermon->preacher_id ) ]['new_id'] ), 253 );
+			}
 
-			// Set service type.
-			wp_set_object_terms( $id, intval( $this->_imported_service_types[ intval( $sermon->service_id ) ]['new_id'] ), 'wpfc_service_type' );
-			$this->log( 'Assigned service type with ID ' . intval( $this->_imported_service_types[ intval( $sermon->service_id ) ]['new_id'] ), 253 );
+			if ( ! empty( $this->_imported_service_types[ intval( $sermon->service_id ) ] ) ) {
+				// Set service type.
+				wp_set_object_terms( $id, intval( $this->_imported_service_types[ intval( $sermon->service_id ) ]['new_id'] ), 'wpfc_service_type' );
+				update_post_meta( $id, 'wpfc_service_type', intval( $this->_imported_service_types[ intval( $sermon->service_id ) ]['new_id'] ) );
+				$this->log( 'Assigned service type with ID ' . intval( $this->_imported_service_types[ intval( $sermon->service_id ) ]['new_id'] ), 253 );
+			}
 
-			// Set series.
-			wp_set_object_terms( $id, intval( $this->_imported_series[ intval( $sermon->series_id ) ]['new_id'] ), 'wpfc_sermon_series' );
-			$this->log( 'Assigned series with ID ' . intval( $this->_imported_series[ intval( $sermon->series_id ) ]['new_id'] ), 253 );
+			if ( ! empty( $this->_imported_series[ intval( $sermon->series_id ) ] ) ) {
+				// Set series.
+				wp_set_object_terms( $id, intval( $this->_imported_series[ intval( $sermon->series_id ) ]['new_id'] ), 'wpfc_sermon_series' );
+				$this->log( 'Assigned series with ID ' . intval( $this->_imported_series[ intval( $sermon->series_id ) ]['new_id'] ), 253 );
+			}
 
 			// Set description.
 			update_post_meta( $id, 'sermon_description', $sermon->description );
diff --git a/includes/vendor/CMB2/includes/types/CMB2_Type_Text_Date.php b/includes/vendor/CMB2/includes/types/CMB2_Type_Text_Date.php
index 1ff0c3e..a63698d 100755
--- a/includes/vendor/CMB2/includes/types/CMB2_Type_Text_Date.php
+++ b/includes/vendor/CMB2/includes/types/CMB2_Type_Text_Date.php
@@ -18,6 +18,7 @@ public function render( $args = array() ) {
 		$args = $this->parse_args( 'text_date', array(
 			'class'           => 'cmb2-text-small cmb2-datepicker',
 			'value'           => isset( $_GET['post'] ) ? ( get_post_meta( $_GET['post'], 'sermon_date_auto', true ) ? '' : $this->field->get_timestamp_format() ) : '',
+			'placeholder'     => isset( $_GET['post'] ) ? get_post_meta( $_GET['post'], 'sermon_date_auto', true) ? 'Same as Published' : '' : '',
 			'desc'            => $this->_desc(),
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ),
 		) );
diff --git a/readme.txt b/readme.txt
index 785fcf8..377890e 100755
--- a/readme.txt
+++ b/readme.txt
@@ -105,12 +105,13 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 ## Changelog ##
 ### 2.13.2 ###
 * New: Add an option to show date "Published" instead of date "Preached" in feed and frontend
+* Change: Use native player in Safari
+* Change: Separate "Preached" and "Published" dates in admin view
 * Fix: Excerpt meta box not showing up
 * Fix: Fix description not showing in the podcast feed
 * Fix: Fix memory leak when site has big number of sermons
 * Fix: Use non-localized dates in the RSS feed
-* Change: Use native player in Safari
-* Change: Separate "Preached" and "Published" dates in admin view
+* Fix: Fix issues with Sermon Browser importing
 
 ### 2.13.1 ###
 * New: Add `list_podcasts` shortcode (thanks @macbookandrew!)

From 2e6988ec900312b7d1dbecc385b54bc21a084559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= <nikolam3244@gmail.com>
Date: Mon, 6 Aug 2018 18:53:37 +0200
Subject: [PATCH 22/22] Update version

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

diff --git a/readme.txt b/readme.txt
index 377890e..1dfebb1 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.13.1  
+Stable tag: 2.13.2  
 License: GPLv2  
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
diff --git a/sermons.php b/sermons.php
index c6e2850..fc17fa4 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.13.1
+ * Version: 2.13.2
  * Author: WP for Church
  * Author URI: https://www.wpforchurch.com/
  * Requires at least: 4.5