Bumped hash on master to 6.0.4

Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php
Bumped version to 6.0.4
2022-06-13 23:59:43 -07:00 · 2022-06-13 23:58:53 -07:00 · 2022-06-13 23:52:48 -07:00 · 2022-06-13 23:51:51 -07:00 · 2022-06-14 01:37:15 -05:00 · 2022-06-13 22:13:18 -07:00
2 changed files with 8 additions and 7 deletions
@@ -117,9 +117,10 @@ class AssetsTransformer
                } else {
                    $value = $asset->{$field->convertUnicodeDbSlug()};

-                    if ($field->format == 'DATE'){
+                    if ($field->format == 'DATE' && !is_null($value)){
                        $value = Helper::getFormattedDateObject($value)['formatted'];
                    }
+                    
                    $fields_array[$field->name] = [
                        'field' => e($field->convertUnicodeDbSlug()),
                        'value' => e($value),
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.0.3',
-  'full_app_version' => 'v6.0.3 - build 8045-ga7b155108',
-  'build_version' => '8045',
+  'app_version' => 'v6.0.4',
+  'full_app_version' => 'v6.0.4 - build 8050-gb448c8965',
+  'build_version' => '8050',
  'prerelease_version' => '',
-  'hash_version' => 'ga7b155108',
-  'full_hash' => 'v6.0.3-153-ga7b155108',
+  'hash_version' => 'gb448c8965',
+  'full_hash' => 'v6.0.4-4-gb448c8965',
  'branch' => 'master',
-);
+);
Author	SHA1	Message	Date
snipe	1806dacb9d	Bumped hash on master to 6.0.4 Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2022-06-13 23:59:43 -07:00
snipe	abb7f23ca5	Bumped version to 6.0.4 Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 23:58:53 -07:00
snipe	b448c89655	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2022-06-13 23:52:48 -07:00
snipe	8857391da7	Merge pull request #11305 from inietov/fixes/trying_to_access_array_offset_on_value_of_type_null Fixed #11304 Trying to access array offset on value of type null at .../Transformers/AssetsTransformer.php	2022-06-13 23:51:51 -07:00
Ivan Nieto Vivanco	50c008ead5	Adds check in condition that format custom dates	2022-06-14 01:37:15 -05:00
snipe	3e8837dd6e	Bumped dev branch to 6.0.3 Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 22:13:18 -07:00