fix Versioned::choose_site_stage() if no request given #8154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Load request from curent controller as a fallback
tractorcow
suggested changes
Jun 11, 2018
model/Versioned.php
Outdated
| @@ -1216,7 +1216,7 @@ public static function can_choose_site_stage($request) { | |||
| */ | |||
| public static function choose_site_stage(SS_HTTPRequest $request = null) { | |||
| if (!$request) { | |||
| throw new InvalidArgumentException("Request not found"); | |||
| $request = Controller::curr()->getRequest(); | |||
There was a problem hiding this comment.
We should check Controller::has_curr() first since there isn't always a current controller.
|
@tractorcow , I have added that check. Thanks! |
tractorcow
approved these changes
Jun 11, 2018
|
Not sure if test failure is related. Re-starting test on 3.7 branch at https://travis-ci.org/silverstripe/silverstripe-framework/builds/389503339 to confirm. |
|
It looks like, somehow, this broke something? I can't see how though. Only postgres broke. |
|
Restarting this build. Maybe it was just an occasional error. |
|
Green |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Load request from current controller as a fallback if none is given.
Several modules break because previous version of choose_site_stage() didn't need the request.