Skip to content

Commit

Permalink
Merge pull request #124 from WP-for-Church/dev
Browse files Browse the repository at this point in the history 
Release 2.8.2
  • Loading branch information
Nikola Miljković authored Oct 5, 2017
2 parents 1850c54 + ab08a90 commit ece984a
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 10 deletions.
6 changes: 5 additions & 1 deletion readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
Stable tag: 2.8.1
Stable tag: 2.8.2
License: GPLv2
License URI: https://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -93,6 +93,10 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
2. Sermon Files

## Changelog ##
### 2.8.2 ###
* Disable error recovery since it's causing too many issues
* Couple bugfixes for PHP 5.3

### 2.8.1 ###
* Fix a PHP notice on new sermon creation
* Fix sermon date not saving on first save
Expand Down
6 changes: 3 additions & 3 deletions sermons.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.1
* Version: 2.8.2
* Author: WP for Church
* Author URI: https://www.wpforchurch.com/
* Requires at least: 4.5
Expand Down Expand Up @@ -56,9 +56,9 @@ public function __construct() {
define( 'SM_VERSION', preg_match( '/^.*Version: (.*)$/m', file_get_contents( __FILE__ ), $version ) ? trim( $version[1] ) : 'N/A' );

// Register error handlers before continuing
include_once 'includes/class-sm-error-recovery.php';
/*include_once 'includes/class-sm-error-recovery.php';
$error_recovery = new SM_Error_Recovery();
$error_recovery->init();
$error_recovery->init();*/

// Break if fatal error detected
if ( defined( 'sm_break' ) && sm_break === true ) {
Expand Down
3 changes: 2 additions & 1 deletion views/archive-wpfc_sermon.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@

<div class="entry-utility">
<span class="comments-link">
<?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( wp_count_comments( $post->ID )['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?>
<?php $comment_count = wp_count_comments( $post->ID ); ?>
<?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( $comment_count['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?>
</span>
<?php edit_post_link( esc_html__( 'Edit', 'sermon-manager-for-wordpress' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</div>
Expand Down
3 changes: 2 additions & 1 deletion views/taxonomy-wpfc_bible_book.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@ class="meta-sep"> by </span> <?php echo the_terms( $post->ID, 'wpfc_preacher', '
</div><!-- .entry-content -->

<div class="entry-utility">
<?php $comment_count = wp_count_comments( $post->ID ); ?>
<span
class="comments-link"><?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( wp_count_comments( $post->ID )['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?></span>
class="comments-link"><?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( $comment_count['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?></span>
<?php edit_post_link( esc_html__( 'Edit', 'sermon-manager-for-wordpress' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-utility -->
</div><!-- #post-## -->
Expand Down
3 changes: 2 additions & 1 deletion views/taxonomy-wpfc_preacher.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@ class="meta-sep"> by </span> <?php echo the_terms( $post->ID, 'wpfc_preacher', '
</div><!-- .entry-content -->

<div class="entry-utility">
<?php $comment_count = wp_count_comments( $post->ID ); ?>
<span
class="comments-link"><?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( wp_count_comments( $post->ID )['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?></span>
class="comments-link"><?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( $comment_count['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?></span>
<?php edit_post_link( esc_html__( 'Edit', 'sermon-manager-for-wordpress' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-utility -->
</div><!-- #post-## -->
Expand Down
3 changes: 2 additions & 1 deletion views/taxonomy-wpfc_sermon_series.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ class="meta-sep"> by </span> <?php echo the_terms( $post->ID, 'wpfc_preacher', '
</div><!-- .entry-content -->

<div class="entry-utility">
<?php $comment_count = wp_count_comments( $post->ID ); ?>
<span
class="comments-link"><?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( wp_count_comments( $post->ID )['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?></span>
class="comments-link"><?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( $comment_count['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?></span>
<?php edit_post_link( esc_html__( 'Edit', 'sermon-manager-for-wordpress' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-utility -->
</div><!-- #post-## -->
Expand Down
3 changes: 2 additions & 1 deletion views/taxonomy-wpfc_sermon_topics.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ class="meta-sep"> by </span> <?php echo the_terms( $post->ID, 'wpfc_preacher', '
</div><!-- .entry-content -->

<div class="entry-utility">
<?php $comment_count = wp_count_comments( $post->ID ); ?>
<span
class="comments-link"><?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( wp_count_comments( $post->ID )['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?></span>
class="comments-link"><?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( $comment_count['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?></span>
<?php edit_post_link( esc_html__( 'Edit', 'sermon-manager-for-wordpress' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-utility -->
</div><!-- #post-## -->
Expand Down
3 changes: 2 additions & 1 deletion views/taxonomy-wpfc_service_type.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@ class="meta-sep"> by </span> <?php echo the_terms( $post->ID, 'wpfc_preacher', '
</div><!-- .entry-content -->

<div class="entry-utility">
<?php $comment_count = wp_count_comments( $post->ID ); ?>
<span
class="comments-link"><?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( wp_count_comments( $post->ID )['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?></span>
class="comments-link"><?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( $comment_count['approved'] ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?></span>
<?php edit_post_link( esc_html__( 'Edit', 'sermon-manager-for-wordpress' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-utility -->
</div><!-- #post-## -->
Expand Down

0 comments on commit ece984a

Please sign in to comment.