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

Release 2.6.2

Author: Nikola Miljković

includes/class-sm-dates.php

@@ -64,7 +64,7 @@ public static function get( $format = '', $post = null, $force_unix_sanitation =
 		// Add the time if time is not set. The way this is done is that it checks for post time, takes it, converts to
 		// seconds and adds to Unix timestamp. It's so we don't have 00:00 time set for all sermons with old date format.
 		if ( ! $has_time ) {
-			$dt = DateTime::createFromFormat( 'U', get_post_time( 'U', true, $post->ID ) );
+			$dt = DateTime::createFromFormat( 'U', mysql2date( 'U', $post->post_date_gmt ) );
 
 			$time = array(
 				$dt->format( 'H' ),

includes/podcast-functions.php

@@ -195,7 +195,7 @@ function wpfc_podcast_summary( $content ) {
  * @return string Modified date
  */
 function wpfc_podcast_item_date( $time, $d = 'U', $gmt = false ) {
-	return wpfc_sermon_date( 'D, d M Y H:i:s O' );
+	return sm_get_the_date( 'D, d M Y H:i:s O' );
 }
 
 /**

includes/sm-core-functions.php

@@ -18,7 +18,17 @@
  */
 function sm_get_the_date( $d = '', $post = null ) {
 	if ( ! $the_date = SM_Dates::get( $d, $post ) ) {
-		$the_date = get_the_date( $d, $post );
+		$post = get_post( $post );
+
+		if ( ! $post ) {
+			return false;
+		}
+
+		if ( '' == $d ) {
+			$the_date = mysql2date( get_option( 'date_format' ), $post->post_date );
+		} else {
+			$the_date = mysql2date( $d, $post->post_date );
+		}
 	}
 
 	/**

includes/widgets.php

@@ -78,26 +78,22 @@ function widget( $args, $instance ) {
 								} ?></a>
                             <span class="meta">
 					<?php
-					$terms = get_the_terms( $post->ID, 'wpfc_preacher' );
-
-					if ( $terms && ! is_wp_error( $terms ) ) :
-
+					if ( $terms = get_the_terms( $post->ID, 'wpfc_preacher' ) ) {
 						$preacher_links = array();
 
 						foreach ( $terms as $term ) {
 							$preacher_links[] = $term->name;
 						}
 
-						$preacher = join( ", ", $preacher_links );
-						echo $preacher;
-						echo ', ';
+						echo '<span class="preachers">', join( ", ", $preacher_links ), '</span>';
 
-					endif;
+						echo '<span class="separator">, </span>';
+					}
 
-					sm_the_date();
+					echo '<span class="date-preached">', sm_get_the_date(), '</span>';
 
 					if ( \SermonManager::getOption( 'widget_show_key_verse' ) ) {
-						wpfc_sermon_meta( 'bible_passage', '<br>' . __( 'Bible Text: ', 'sermon-manager' ), '' );
+						echo '<span class="bible-passage"><br>', __( 'Bible Text: ', 'sermon-manager' ), get_wpfc_sermon_meta( 'bible_passage' ), '</span>';
 					}
 					?>
 				</span>

readme.txt

@@ -5,7 +5,7 @@ Tags: church, sermon, sermons, preaching, podcasting, manage, managing, podcasts
 Requires at least: 4.5
 Tested up to: 4.8.2
 Requires PHP: 5.6
-Stable tag: 2.6.1
+Stable tag: 2.6.2
 License: GPLv2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -89,6 +89,10 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 2. Sermon Files
 
 == Changelog ==
+= 2.6.2 =
+* Add more `<span>` elements for more styling options
+* Fix podcast feed not working
+
 = 2.6.1 =
 * Fix fatal error on old PHP versions
 * Fix custom preacher slug not working

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.6.1
+ * Version: 2.6.2
  * Author: WP for Church
  * Author URI: https://www.wpforchurch.com/
  * Requires at least: 4.5