tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '5' into 6

Browse Source
This commit is contained in:
github-actions 2024-06-30 08:41:28 +00:00
commit a4149d12cf
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sake
View File

@ -42,7 +42,7 @@ fi
# Find the PHP binary # Find the PHP binary
for candidatephp in php php5; do 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` php=`which $candidatephp 2>/dev/null`
break break
fi fi
@ -116,4 +116,4 @@ fi
################################################################################################ ################################################################################################
## Basic execution ## Basic execution
$php $framework/cli-script.php ${*} "$php" "$framework/cli-script.php" "${@}"

1
src/Forms/SearchableDropdownTrait.php
View File

@ -397,7 +397,6 @@ trait SearchableDropdownTrait
$record->$classNameField = $ids ? $record->ClassName : ''; $record->$classNameField = $ids ? $record->ClassName : '';
} }
} }
$record->write();
} else { } else {
// has_many / many_many field // has_many / many_many field
if (!method_exists($record, 'hasMethod')) { if (!method_exists($record, 'hasMethod')) {