Skip to content

Commit

Permalink
Merge pull request #88 from firetreedesign/v1.4.2
Browse files Browse the repository at this point in the history
Fixed an error when viewing the Add-ons page
  • Loading branch information
danielmilner authored Mar 25, 2021
2 parents f14649b + bcf96ab commit 67789aa
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ccbpress-core.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Church Data Connect for Church Community Builder
* Plugin URI: https://churchdataconnect.com/
* Description: Display information from Church Community Builder on your WordPress site.
* Version: 1.4.1
* Version: 1.4.2
* Author: FireTree Design, LLC <[email protected]>
* Author URI: https://firetreedesign.com/
* Text Domain: ccbpress-core
Expand Down Expand Up @@ -66,7 +66,7 @@ class CCBPress_Core {
* @var string
* @since 1.0.0
*/
public $version = '1.4.0';
public $version = '1.4.2';

/**
* Main CCBPress_Core Instance
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/admin-pages.php
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ private function get_addons_data() {
if ( false !== $data ) {
$data = json_decode( $data );
if ( null === $data ) {
$data = wp_json_decode( wp_json_encode( new stdClass() ) );
$data = json_decode( wp_json_encode( new stdClass() ) );
}
usort( $data, array( $this, 'sort_addons_data' ) );
return $data;
Expand All @@ -563,7 +563,7 @@ private function get_addons_data() {

$data = json_decode( $data );
if ( null === $data ) {
$data = wp_json_decode( wp_json_encode( new stdClass() ) );
$data = json_decode( wp_json_encode( new stdClass() ) );
}
usort( $data, array( $this, 'sort_addons_data' ) );

Expand Down
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: church, ccb, church community builder, chms, gutenberg
Requires at least: 4.3
Tested up to: 5.7
Requires PHP: 5.3
Stable tag: 1.4.1
Stable tag: 1.4.2
License: GPLv2 or later
License URI: http://ww.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -45,6 +45,9 @@ Extend the capabilities of Church Data Connect for Church Community Builder with

== Changelog ==

= 1.4.2 =
* Fixed an error when viewing the Add-ons page.

= 1.4.1 =
* Fixed a bug that broke the last update.

Expand Down

0 comments on commit 67789aa

Please sign in to comment.