'; break; - case 'bb-theme'; - echo '
'; - break; - case 'bb-theme-builder'; - echo '
'; - break; - case 'oceanwp'; - echo '
'; - break; + case 'bb-theme': + echo '
'; + break; + case 'bb-theme-builder': + echo '
'; + break; + case 'oceanwp': + echo '
'; + break; default: echo apply_filters( 'sm_templates_wrapper_start', '
' ); break; From ed4a8b4d0027cea28b9d920e306fd4d6d98a459f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= Date: Tue, 12 Jun 2018 02:26:53 +0200 Subject: [PATCH 10/15] Update changelog --- readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme.txt b/readme.txt index 18c8487..4f6abfb 100755 --- a/readme.txt +++ b/readme.txt @@ -103,6 +103,8 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man ## Changelog ## ### 2.13.1 ### +* New: Support for OceanWP theme +* Fix: Wrappers do not get overriden * Fix: Feed showing PHP notice in some rare cases * Fix: Archive page slug not applying From 9714200ef5e8c3998fdbd220b2e99bc92c4264fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= Date: Tue, 12 Jun 2018 02:32:11 +0200 Subject: [PATCH 11/15] Update changelog --- readme.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.txt b/readme.txt index ccb96d7..e299b35 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.1 ### * New: Support for OceanWP theme +* New: Add `list_podcasts` shortcode (thanks @macbookandrew!) * Fix: Wrappers do not get overriden * Fix: Feed showing PHP notice in some rare cases * Fix: Archive page slug not applying From 6227861a5b34caf2b9a71c9d50a72855a6f818ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= Date: Tue, 12 Jun 2018 02:37:47 +0200 Subject: [PATCH 12/15] Update ISSUE_TEMPLATE.md --- .github/ISSUE_TEMPLATE.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 6605c9e..8b8ce96 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,18 +1,21 @@ ### Expected Behaviour -1. +1. +2. ### Actual Behaviour -1. +1. +2. ### Steps To Reproduce -1. +1. +2. ### Platform -**Sermon Manager Version:** -**WordPress Version:** +**Sermon Manager Version:** +**WordPress Version:** **PHP Version:** ### Any Additional Info From 5784e6f0bb4b2351d093d756541c019eb815a34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= Date: Tue, 12 Jun 2018 02:43:36 +0200 Subject: [PATCH 13/15] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c5e907a..f5b9102 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,5 @@ -## Types of changes - +## Types of changes: + - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) @@ -7,11 +7,16 @@ ## Checklist: -- [ ] My code follows the code style of this project. (WPCS) +- [ ] I have read the [**CONTRIBUTING**](CONTRIBUTING.md) document. +- [ ] My code follows the code style of this project. ([WPCS](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards)) - [ ] My change requires a change to the documentation. -- [ ] I have read the **CONTRIBUTING** document. - +## Brief description of the proposed change: + + + + +## Any other info: + + + From 02879b511328b1a6ee3e1ac913dbbc6c26c78b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= Date: Tue, 12 Jun 2018 10:55:46 +0200 Subject: [PATCH 14/15] Fix taxonomy list shortcode arguments Fixes #214 --- includes/admin/sm-cmb-functions.php | 5 ++++- includes/class-sm-shortcodes.php | 2 +- includes/vendor/taxonomy-images/public-filters.php | 5 ++++- readme.txt | 7 ++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/includes/admin/sm-cmb-functions.php b/includes/admin/sm-cmb-functions.php index ff26633..c3f6907 100755 --- a/includes/admin/sm-cmb-functions.php +++ b/includes/admin/sm-cmb-functions.php @@ -156,7 +156,10 @@ function cmb2_get_term_options( $taxonomy = 'category' ) { 'hide_empty' => false, ); - $terms = (array) get_terms( $taxonomy, $args ); + $terms = (array) get_terms( + array( + 'taxonomy' => $taxonomy, + ) + $args ); // Initialize an empty array. $term_options = array(); diff --git a/includes/class-sm-shortcodes.php b/includes/class-sm-shortcodes.php index ce48c6d..98fa173 100755 --- a/includes/class-sm-shortcodes.php +++ b/includes/class-sm-shortcodes.php @@ -417,7 +417,7 @@ public function display_images( $atts = array() ) { // Default args. $args = array( 'display' => 'series', - 'order' => 'DESC', + 'order' => 'ASC', 'orderby' => 'name', 'size' => 'sermon_medium', 'hide_title' => false, diff --git a/includes/vendor/taxonomy-images/public-filters.php b/includes/vendor/taxonomy-images/public-filters.php index 2227934..01d45eb 100755 --- a/includes/vendor/taxonomy-images/public-filters.php +++ b/includes/vendor/taxonomy-images/public-filters.php @@ -94,7 +94,10 @@ function sermon_images_plugin_get_terms( $default, $args = array() ) { return array(); } - $terms = get_terms( $args['taxonomy'], $args['term_args'] ); + $terms = get_terms( + array( + 'taxonomy' => $args['taxonomy'], + ) + $args['term_args'] ); if ( is_wp_error( $terms ) ) { return array(); } diff --git a/readme.txt b/readme.txt index e299b35..251be10 100755 --- a/readme.txt +++ b/readme.txt @@ -104,11 +104,12 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man ## Changelog ## ### 2.13.1 ### -* New: Support for OceanWP theme * New: Add `list_podcasts` shortcode (thanks @macbookandrew!) -* Fix: Wrappers do not get overriden -* Fix: Feed showing PHP notice in some rare cases +* New: Support for OceanWP theme * 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 ### 2.13.0 ### * New: Add a simpler way of overriding sermon render From 23f8f94167b3552059c39aeee3e9d2b42b55c685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?= Date: Tue, 12 Jun 2018 12:12:23 +0200 Subject: [PATCH 15/15] Update versions --- readme.txt | 2 +- sermons.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.txt b/readme.txt index 251be10..266fe94 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.0 +Stable tag: 2.13.1 License: GPLv2 License URI: https://www.gnu.org/licenses/gpl-2.0.html diff --git a/sermons.php b/sermons.php index 45cd7ae..db3be7b 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.0 + * Version: 2.13.1 * Author: WP for Church * Author URI: https://www.wpforchurch.com/ * Requires at least: 4.5