Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.0] Fall back to system template when template file not found #30857

Merged
merged 4 commits into from Oct 2, 2020
Merged

[4.0] Fall back to system template when template file not found #30857

merged 4 commits into from Oct 2, 2020

Conversation

SharkyKZ
Copy link
Contributor

@SharkyKZ SharkyKZ commented Oct 2, 2020

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 tmpl parameter 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.

@SharkyKZ SharkyKZ changed the title [4.0] Fall back to system template when template not found [4.0] Fall back to system template when template file not found Oct 2, 2020
@ghost
Copy link

ghost commented Oct 2, 2020

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.

@ceford
Copy link
Contributor

ceford commented Oct 2, 2020

I have tested this item ✅ successfully on 9d51a19

OK!


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/30857.

@alikon
Copy link
Contributor

alikon commented Oct 2, 2020

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/30857.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Oct 2, 2020
@Quy Quy added the PR-4.0-dev label Oct 2, 2020
@HLeithner HLeithner merged commit b0b25e5 into joomla:4.0-dev Oct 2, 2020
@HLeithner
Copy link
Member

Thanks

@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Oct 2, 2020
@HLeithner HLeithner added this to the Joomla 4.0 milestone Oct 2, 2020
@SharkyKZ SharkyKZ deleted the j4/cleanup/fetch-template branch October 2, 2020 17:30
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants