Merge branch 'develop' into loading-order

# Conflicts:
#	functions.php

Author: corsacca

dt-core/global-functions.php

@@ -642,6 +642,7 @@ function render_field_for_display( $field_key, $fields, $post, $show_extra_contr
             }
 
             if ( $is_legacy ) {
+                $is_empty_post = count( array_keys( $post ) ) <= 1; // if this is a new post, it only has a post_type key
                 ?>
                 <div class="section-subheader">
                     <?php dt_render_field_icon( $fields[$field_key] );
@@ -692,7 +693,7 @@ class="add-link__option"
                         </div>
 
                     <?php endif; ?>
-                    <?php if ( ( $field_type === 'location' || 'location_meta' === $field_type ) && DT_Mapbox_API::get_key() && ! empty( $post ) ) : ?>
+                    <?php if ( ( $field_type === 'location' || 'location_meta' === $field_type ) && DT_Mapbox_API::get_key() && !$is_empty_post ) : ?>
                         <button data-list-class="<?php echo esc_html( $field_key ) ?>" class="add-button" id="new-mapbox-search" type="button" <?php echo esc_html( $disabled ); ?>>
                             <img src="<?php echo esc_html( get_template_directory_uri() . '/dt-assets/images/small-add.svg' ) ?>"/>
                         </button>
@@ -787,7 +788,7 @@ class="text-input" value="<?php echo esc_html( $post[$field_key] ?? '' ) ?>" <?p
                         </div>
                     </div>
                 <?php elseif ( $field_type === 'location_meta' ) : ?>
-                    <?php if ( DT_Mapbox_API::get_key() && empty( $post ) ) : // test if Mapbox key is present ?>
+                    <?php if ( DT_Mapbox_API::get_key() && $is_empty_post ) : // test if Mapbox key is present ?>
                         <div id="mapbox-autocomplete" class="mapbox-autocomplete input-group" data-autosubmit="false">
                             <input id="mapbox-search" type="text" class="input-group-field" name="mapbox_search" placeholder="Search Location" autocomplete="off" dir="auto" <?php echo esc_html( $disabled ); ?>/>
                             <div class="input-group-button">

dt-core/utilities/dt-components.php

@@ -67,21 +67,13 @@ public static function shared_attributes( $field_key, $fields, $post, $params =
         return $shared_attributes;
     }
 
-    public static function render_icon_slot( $field ) {
-        if ( isset( $field['font-icon'] ) && !empty( $field['font-icon'] ) ): ?>
-            <span slot="icon-start">
-                <i class="dt-icon <?php echo esc_html( $field['font-icon'] ) ?>"></i>
-            </span>
-        <?php endif;
-    }
-
     public static function render_communication_channel( $field_key, $fields, $post, $params = [] ) {
         $shared_attributes = self::shared_attributes( $field_key, $fields, $post, $params );
         ?>
         <dt-multi-text <?php echo wp_kses_post( $shared_attributes ) ?>
-            value="<?php echo esc_attr( isset( $post[$field_key] ) ? json_encode( $post[$field_key] ) : '' ) ?>"
-            <?php self::render_icon_slot( $fields[$field_key] ) ?>
-        ></dt-multi-text>
+            value="<?php echo esc_attr( isset( $post[$field_key] ) ? json_encode( $post[$field_key] ) : '' ) ?>">
+            <?php dt_render_icon_slot( $fields[$field_key] ) ?>
+        </dt-multi-text>
         <?php
     }
 
@@ -160,9 +152,8 @@ public static function render_location_meta( $field_key, $fields, $post, $params
         $shared_attributes = self::shared_attributes( $field_key, $fields, $post, $params );
         ?>
         <dt-location <?php echo wp_kses_post( $shared_attributes ) ?>
-            value="<?php echo esc_html( $post[$field_key] ?? '' ) ?>"
+            value="<?php echo esc_html( $post[$field_key] ?? '' ) ?>">
             <?php dt_render_icon_slot( $fields[$field_key] ) ?>
-            >
         </dt-location>
         <?php
     }

functions.php

@@ -103,7 +103,7 @@ public function __construct() {
          * Prepare variables
          */
         $this->token = 'disciple_tools';
-        $this->version = '1.70.0';
+        $this->version = '1.70.1';
         // $this->migration_number = 38; // moved to Disciple_Tools_Migration_Engine::$migration_number
 
         $this->theme_url = get_template_directory_uri() . '/';

style.css

@@ -3,7 +3,7 @@ Theme Name: Disciple Tools
 Theme URI: https://github.com/DiscipleTools/disciple-tools-theme
 Description: Disciple.Tools is a coalition management system for disciple making movements.
 Author URI: https://github.com/DiscipleTools
-Version: 1.70.0
+Version: 1.70.1
 Requires at least: 4.7.0
 License: GPL-2.0 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html