Skip to content

Commit 1867db6

Browse files
committed
Merge branch 'master' into develop
# Conflicts: # functions.php
2 parents b7de071 + aceb5da commit 1867db6

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

dt-core/global-functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ function render_field_for_display( $field_key, $fields, $post, $show_extra_contr
642642
}
643643

644644
if ( $is_legacy ) {
645-
$is_empty_post = count( array_keys( $post ) ) <= 1; // if this is a new post, it only has a post_type key
645+
$is_empty_post = !is_array( $post ) || count( array_keys( $post ) ) <= 1; // if this is a new post, it only has a post_type key
646646
?>
647647
<div class="section-subheader">
648648
<?php dt_render_field_icon( $fields[$field_key] );

functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function __construct() {
103103
* Prepare variables
104104
*/
105105
$this->token = 'disciple_tools';
106-
$this->version = '1.70.1';
106+
$this->version = '1.70.2';
107107
// $this->migration_number = 38; // moved to Disciple_Tools_Migration_Engine::$migration_number
108108

109109
$this->theme_url = get_template_directory_uri() . '/';

style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Theme Name: Disciple Tools
33
Theme URI: https://github.com/DiscipleTools/disciple-tools-theme
44
Description: Disciple.Tools is a coalition management system for disciple making movements.
55
Author URI: https://github.com/DiscipleTools
6-
Version: 1.70.1
6+
Version: 1.70.2
77
Requires at least: 4.7.0
88
License: GPL-2.0 or later
99
License URI: https://www.gnu.org/licenses/gpl-2.0.html

0 commit comments

Comments
 (0)