[4.0] Fall back to system template when template file not found#30857
Merged
HLeithner merged 4 commits intojoomla:4.0-devfrom Oct 2, 2020
SharkyKZ:j4/cleanup/fetch-template
Merged
[4.0] Fall back to system template when template file not found#30857HLeithner merged 4 commits intojoomla:4.0-devfrom SharkyKZ:j4/cleanup/fetch-template
HLeithner merged 4 commits intojoomla:4.0-devfrom
SharkyKZ:j4/cleanup/fetch-template
Conversation
|
I have tested this item ✅ successfully on 9d51a19 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/30857. |
Contributor
|
I have tested this item ✅ successfully on 9d51a19 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/30857. |
Contributor
|
RTC This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/30857. |
Member
|
Thanks |
dgrammatiko
added a commit
to dgrammatiko/joomla-cms
that referenced
this pull request
Oct 2, 2020
…s-cs * '4.0-dev' of github.com:joomla/joomla-cms: [4.0] Templates: Styles (Administrator) menu color changes on save (joomla#30847) Namespace (joomla#30865) [4.0] Fall back to system template when template file not found (joomla#30857) [4.0] joomla update show password (joomla#30849) [4.0] com_media options (joomla#30852) [4.0] Update lib_joomla.ini (joomla#30867) [4.0] Missing js file in joomla#30813 (joomla#30859) [4.0] Site Contacts Category List Search Filters (joomla#30813) Add update SQL script for previous 4.0 beta versions Dont use id in WHERE clause for updating menu items in update SQL script
dgrammatiko
added a commit
to dgrammatiko/joomla-cms
that referenced
this pull request
Oct 4, 2020
…ue-cs * '4.0-dev' of github.com:joomla/joomla-cms: (22 commits) [4.0] Change the size of the template name font in module position selector (joomla#30890) [4.0] Media Manager close preview (joomla#30851) [4.0] sticky sidebar menu (joomla#30853) [4.0] treeselect alerts (joomla#30854) [4.0] Fix pagebreak modal missing style (joomla#30889) [4.0] xtd-editor button for module (joomla#30892) [4.0] Templates: Styles (Administrator) menu color changes on save (joomla#30847) Namespace (joomla#30865) [4.0] Fall back to system template when template file not found (joomla#30857) [4.0] joomla update show password (joomla#30849) [4.0] com_media options (joomla#30852) [4.0] Update lib_joomla.ini (joomla#30867) [4.0] Missing js file in joomla#30813 (joomla#30859) [4.0] Site Contacts Category List Search Filters (joomla#30813) [4.0] Article Links markup (joomla#30824) [4.0] Language reinstall (joomla#30810) [4.0] tinmyce toolbar icons (joomla#30825) [4.0] hidden-xs-up (joomla#30837) Update com_mails.ini (joomla#30842) [4.0] Add css style for mod_articles_news vertical layout (joomla#30797) ... # Conflicts: # administrator/components/com_media/resources/scripts/components/modals/modal.vue
sakiss
pushed a commit
to sakiss/joomla-cms
that referenced
this pull request
Oct 16, 2020
…la#30857) * Fall back to system template * Load parent language file only when needed * Correct template file
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Summary of Changes
Fixes small regression from #30192.
Removes unnecessary file lookup.
Removes parent language file loading when template has no parent.
Testing Instructions
Enter a URL with
tmplparameter containing non-existing template file. E.g.tmpl=foo.Actual result BEFORE applying this Pull Request
Cassiopeia template is loaded without parameters, logo changed to sitename.
Expected result AFTER applying this Pull Request
Unstyled system template is loaded.
Documentation Changes Required
No.