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

Release 2.6.1
WP-for-Church · Sep 21, 2017 · 6bc6dd5 · 6bc6dd5
2 parents 26b6f08 + 6556516
commit 6bc6dd5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/includes/class-sm-dates-wp.php b/includes/class-sm-dates-wp.php
@@ -39,6 +39,6 @@ public static function hook() {
 			return;
 		}
 
-		add_filter( 'get_the_date', array( self::class, 'get_the_date' ), 10, 3 );
+		add_filter( 'get_the_date', array( get_class( new SM_Dates_WP ), 'get_the_date' ), 10, 3 );
 	}
 }
diff --git a/includes/options.php b/includes/options.php
@@ -26,7 +26,8 @@ static function wpfc_validate_options( $input ) {
 		$input['archive_title']     = wp_filter_nohtml_kses( $input['archive_title'] ); // Sanitize textbox input (strip html tags, and escape characters)
 		$input['podcasts_per_page'] = intval( $input['podcasts_per_page'] );
 
-		if ( SermonManager::getOption( 'archive_slug' ) != $input['archive_slug'] ) {
+		if ( SermonManager::getOption( 'archive_slug' ) != $input['archive_slug'] ||
+		     SermonManager::getOption( 'preacher_label' ) != $input['preacher_label'] ) {
 			update_option( 'sm_flush_rewrite_rules', '1' );
 		}
 

diff --git a/readme.txt b/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
+Stable tag: 2.6.1
 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.1 =
+* Fix fatal error on old PHP versions
+* Fix custom preacher slug not working
+
 = 2.6 =
 * Fix PHP warning regarding sorting
 * Fix Taxonomy images not working on initial plugin install (and sometimes for existing ones as well - needs plugin re-activation)

diff --git 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.6
+ * Version: 2.6.1
  * Author: WP for Church
  * Author URI: https://www.wpforchurch.com/
  * Requires at least: 4.5
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,6 @@ public static function hook() { @@
     			return;
     		}
-    		add_filter( 'get_the_date', array( self::class, 'get_the_date' ), 10, 3 );
+    		add_filter( 'get_the_date', array( get_class( new SM_Dates_WP ), 'get_the_date' ), 10, 3 );
     	}
     }