From ce5cfcac61e42c0457aa6709dd2ab0b314bacd48 Mon Sep 17 00:00:00 2001 From: "johannes.hammersen" Date: Wed, 19 Jun 2024 11:13:54 +0200 Subject: [PATCH 1/2] FIX Remove write from SearchableDropdownTrait In the SearchableDropdownTrait::saveInto method, if the field is a has_one relationship, $record->write() was called. FormField and any other instances of saveInto should not call write - that should be called by the form itself. --- src/Forms/SearchableDropdownTrait.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Forms/SearchableDropdownTrait.php b/src/Forms/SearchableDropdownTrait.php index 7d93f04c1eb..97923f711d0 100644 --- a/src/Forms/SearchableDropdownTrait.php +++ b/src/Forms/SearchableDropdownTrait.php @@ -397,7 +397,6 @@ public function saveInto(DataObjectInterface $record): void $record->$classNameField = $ids ? $record->ClassName : ''; } } - $record->write(); } else { // has_many / many_many field if (!method_exists($record, 'hasMethod')) { From 90eac66ea83682302224a207ec96bb01385e625c Mon Sep 17 00:00:00 2001 From: Giancarlo Di Massa Date: Sat, 22 Jun 2024 18:15:33 +0200 Subject: [PATCH 2/2] Update sake Fix bug in sake that happens when the PHP interpreter is a directory with spaces in it. --- sake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sake b/sake index 65d9af3394a..59103445b54 100755 --- a/sake +++ b/sake @@ -42,7 +42,7 @@ fi # Find the PHP binary for candidatephp in php php5; do - if [ `which $candidatephp 2>/dev/null` -a -f `which $candidatephp 2>/dev/null` ]; then + if [ "`which $candidatephp 2>/dev/null`" -a -f "`which $candidatephp 2>/dev/null`" ]; then php=`which $candidatephp 2>/dev/null` break fi @@ -116,4 +116,4 @@ fi ################################################################################################ ## Basic execution -$php $framework/cli-script.php ${*} +"$php" "$framework/cli-script.php" "${@}"