Skip to content

Commit 67789aa

Browse files
authored
Merge pull request #88 from firetreedesign/v1.4.2
Fixed an error when viewing the Add-ons page
2 parents f14649b + bcf96ab commit 67789aa

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

ccbpress-core.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: Church Data Connect for Church Community Builder
44
* Plugin URI: https://churchdataconnect.com/
55
* Description: Display information from Church Community Builder on your WordPress site.
6-
* Version: 1.4.1
6+
* Version: 1.4.2
77
* Author: FireTree Design, LLC <info@firetreedesign.com>
88
* Author URI: https://firetreedesign.com/
99
* Text Domain: ccbpress-core
@@ -66,7 +66,7 @@ class CCBPress_Core {
6666
* @var string
6767
* @since 1.0.0
6868
*/
69-
public $version = '1.4.0';
69+
public $version = '1.4.2';
7070

7171
/**
7272
* Main CCBPress_Core Instance

includes/admin/admin-pages.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ private function get_addons_data() {
540540
if ( false !== $data ) {
541541
$data = json_decode( $data );
542542
if ( null === $data ) {
543-
$data = wp_json_decode( wp_json_encode( new stdClass() ) );
543+
$data = json_decode( wp_json_encode( new stdClass() ) );
544544
}
545545
usort( $data, array( $this, 'sort_addons_data' ) );
546546
return $data;
@@ -563,7 +563,7 @@ private function get_addons_data() {
563563

564564
$data = json_decode( $data );
565565
if ( null === $data ) {
566-
$data = wp_json_decode( wp_json_encode( new stdClass() ) );
566+
$data = json_decode( wp_json_encode( new stdClass() ) );
567567
}
568568
usort( $data, array( $this, 'sort_addons_data' ) );
569569

readme.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Tags: church, ccb, church community builder, chms, gutenberg
44
Requires at least: 4.3
55
Tested up to: 5.7
66
Requires PHP: 5.3
7-
Stable tag: 1.4.1
7+
Stable tag: 1.4.2
88
License: GPLv2 or later
99
License URI: http://ww.gnu.org/licenses/gpl-2.0.html
1010

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

4646
== Changelog ==
4747

48+
= 1.4.2 =
49+
* Fixed an error when viewing the Add-ons page.
50+
4851
= 1.4.1 =
4952
* Fixed a bug that broke the last update.
5053

0 commit comments

Comments
 (0)