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

Fix linting.

Browse Source
This commit is contained in:
Maxime Rainville 2018-06-19 09:11:16 +12:00 committed by Daniel Hensby
parent 7fda52b2cd
commit c77042aa8b
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Forms/Form.php
View File

@ -1401,7 +1401,7 @@ class Form extends ViewableData implements HasRequestHandler
// `setValue` method to use. // `setValue` method to use.
if (($mergeStrategy & self::MERGE_AS_INTERNAL_VALUE) == self::MERGE_AS_INTERNAL_VALUE) { if (($mergeStrategy & self::MERGE_AS_INTERNAL_VALUE) == self::MERGE_AS_INTERNAL_VALUE) {
$submitted = false; $submitted = false;
} else if (($mergeStrategy & self::MERGE_AS_SUBMITTED_VALUE) == self::MERGE_AS_SUBMITTED_VALUE) { } elseif (($mergeStrategy & self::MERGE_AS_SUBMITTED_VALUE) == self::MERGE_AS_SUBMITTED_VALUE) {
$submitted = true; $submitted = true;
} }

1
tests/php/Forms/FormTest.php
View File

@ -1071,7 +1071,6 @@ class FormTest extends FunctionalTest
$this->mainSession->session()->get('FormInfo.Form_Form'), $this->mainSession->session()->get('FormInfo.Form_Form'),
'Our form was reloaded successfully. That should have cleared our session.' 'Our form was reloaded successfully. That should have cleared our session.'
); );
} }
protected function getStubForm() protected function getStubForm()