Merge branch 'TMS-950' into stage

devgeniem · Sep 27, 2023 · 19ef751 · 19ef751
2 parents bc22c9d + 07642c6
commit 19ef751
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -8,8 +8,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 
 - TMS-970: Add image caption text to call-to-action and content-columns blocks.
+- TMS-950: Empty check for phone repeater.
+
+## [1.49.0] - 2023-09-15
+
 - TMS-962: Add Lunch Menus plugin caps to roles.
 
+## [1.48.0] - 2023-09-13
+
+- TMS-973: Fix manual event sorting
+>>>>>>> TMS-950
+
+
 ## [1.47.0] - 2023-09-04
 
 - TMS-964-2: Update translation and format pricing.

diff --git a/lib/Formatters/ContactFormatter.php b/lib/Formatters/ContactFormatter.php
@@ -150,7 +150,7 @@ public function map_keys( array $posts, array $field_keys, $default_image = null
                 $fields               = $this->append_image( $fields, $field_key, $default_image );
             }
 
-            if ( isset( $fields['phone_repeater'] ) ) {
+            if ( ! empty( $fields['phone_repeater'] ) ) {
                 $fields['phone_repeater'] = array_filter( $fields['phone_repeater'], function ( $item ) {
                     return ! empty( $item['phone_text'] ) || ! empty( $item['phone_number'] );
                 } );

diff --git a/style.css b/style.css
@@ -2,7 +2,7 @@
  * Theme Name:  TMS Theme Base
  * Description: Tampere Multisite Base Theme
  * Domain Path: /lang
- * Version:     1.45.0
+ * Version:     1.48.0
  * Author:      Geniem
  * Author URI:  https://geniem.fi
  * Text Domain: tms-theme-base