Don't set homepage template to null, if theme.yml is not present.
#6253
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
GwendolenLynch
approved these changes
Jan 13, 2017
CarsonF
reviewed
Jan 13, 2017
| @@ -32,7 +32,9 @@ public function homepage($content) | |||
| $templates = []; | |||
|
|
|||
| // First candidate: Theme-specific config.yml file. | |||
| $templates[] = $this->config->get('theme/homepage_template'); | |||
| if ($this->config->get('theme/homepage_template')) { | |||
There was a problem hiding this comment.
Could save the second look up by saving the result here.
There was a problem hiding this comment.
I know, but I made it in line with the dozen or so other similar statements in that file. If we change this one, we should change all of them to keep it consistent.
| $templates[] = $this->config->get('theme/homepage_template'); | ||
| if ($this->config->get('theme/homepage_template')) { | ||
| $templates[] = $this->config->get('theme/homepage_template'); | ||
| } | ||
|
|
||
| // Second candidate: Global config.yml file. | ||
| $templates[] = $this->config->get('general/homepage_template'); |
There was a problem hiding this comment.
It should, unless somebody explicitly deletes it from their config.yml
GwendolenLynch
force-pushed
the
hotfix/no-null-template
branch
from
1a71e8a
to
3a0adc9
Compare
GwendolenLynch
force-pushed
the
hotfix/no-null-template
branch
from
3a0adc9
to
509fabd
Compare
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.
No description provided.