Update StyleModel.php by BrainforgeUK · Pull Request #40665 · joomla/joomla-cms

BrainforgeUK · 2023-05-27T08:51:37Z

Corrected language .ini file handling in child templates.

Pull Request for Issue #40660 .

Summary of Changes

Corected loading of core and/or local language file(s).

Testing Instructions

Install the following very simple child templates (test1, test2(:

tpl_cassiopeia_test1.zip

tpl_cassiopeia_test2.zip

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Link to documentations

Please select:

Documentation link for docs.joomla.org:
[*] No documentation changes for docs.joomla.org needed
Pull Request link for manual.joomla.org:
[*] No documentation changes for manual.joomla.org needed

Corrected language .ini file handling in child templates.

ChristineWk · 2023-05-27T10:08:25Z

@BrainforgeUK

got this message:

but template folder is writeable.

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/40665.}

BrainforgeUK · 2023-05-27T10:50:41Z

A benign issue, no media files in my test child templates! See ...
https://issues.joomla.org/tracker/joomla-cms/40666

BrainforgeUK · 2023-05-27T11:19:29Z

Additional pull request created to fix benign message.
#40667

brianteeman · 2023-05-27T11:50:45Z

Seems very odd to me that this is needed as I have had no problems at all with child templates and language strings.

You can try any of the zip files at https://github.com/brianteeman/joomlachild/tree/main/examples they are all child templates of cassiopeia

administrator/components/com_templates/src/Model/StyleModel.php

Fix PHP code style errors Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

BrainforgeUK · 2023-08-11T16:29:20Z

Is this requiring any action on my part?

obuisard · 2023-08-14T00:08:39Z

Is this requiring any action on my part?

No, thanks for the PR Jonathan @BrainforgeUK, we now need people to test :-)

robinclapp · 2023-08-26T16:48:21Z

I have tested this item ✅ successfully on a174660

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/40665.}

blanderson22 · 2023-08-26T16:48:33Z

I have tested this item ✅ successfully on a174660

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/40665.}

richard67 · 2023-08-26T16:50:45Z

RTC

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/40665.}

obuisard · 2023-08-29T13:13:47Z

Thank you Jonathan @BrainforgeUK for the PR.

@brianteeman

* fix calendar positioning (#41477) * Update joomla-field-media.w-c.es6.js (#41361) * Fixing md5 Deprecation in document.php (#39880) * modal field check for danger alert (#39173) * fix (#41138) * [4.x] Cassiopeia Install SQL (#37389) * Fix/showon (#37451) * Bugfix for Issue #38599 - Smart Search indexing macros from articles (#38998) * [4,3] joomla alert icons (#39312) * Update StyleModel.php (#40665) * Update Query.php (#40687) * remove hitcount variable from uri after voting (#41474) * Fix deprecated message in categories when extension is empty (#40604) * Re-add minus to allowed filenames in com_templates (#41369) * Invalid delete of all content articles from smart search index (#41288) * [4][cli] schema update check (#40468) * Tags: Don't put NULL into trim() (#41509) Co-authored-by: Quy <quy@nomonkeybiz.com> * [4] Add multilanguage filter taxonomy rows in com_finder advanced filters (#41470) * Fix taxonomy filter options * refactor rest of query to prepared statements --------- Co-authored-by: Quy <quy@nomonkeybiz.com> * Check if the pre update check box actually exists (#41467) * Allow onValidateContact plugin to show error message (#37540) * [4.4] Backward compatibility handling for plugins that setting the result directly (#41525) * Backward compatibility handling for plugins that setting the result directly. * Update libraries/src/Event/AbstractImmutableEvent.php Co-authored-by: Brian Teeman <brian@teeman.net> --------- * Tests for com_privacy consent on user site (#41529) * Tests for com_privacy consent on user site * Allow ability to enable extension in tests to prevent errors * remove paramater not needed * Added fixes to stop errors in drone build * Added fixes to stop errors in drone build * Added fixes to stop errors in drone build * [4.4] system test for com_installer (#41483) * system test for com_installer * cs * Missing System Tests in #41362 (#41479) * Update Categories.cy.js * Update Categories.cy.js * Update Categories.cy.js * Update Categories.cy.js * Update Categories.cy.js * Update Categories.cy.js added spaces and semicolons * Update Categories.cy.js Missing spaces and semicolons * Update Categories.cy.js Missing spaces and semicolons * Update Categories.cy.js Missing spaces and semicolons * Update Categories.cy.js removed tabs * Update Categories.cy.js Removed tabs * Update Categories.cy.js Removed tabs * Update Categories.cy.js Removed tabs * Update Language.php (#41353) * Filter for special characters that fail sending test mail (#41469) * Backporting event changes (#41484) Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com> * api tests for endpoints for com_privacy consent (#41544) * Show the plugin name in the update screen (#41537) * Show the plugin name in the update screen * cs --------- * Replace the special characters in site name for mail templates (#41582) * Updates the dependencies (#41538) * Updating dependencies * Major update cypress * Thanks for the reminder @brianteeman * Composer * weekend updates * Update dependencies * Update incompatible HTML file --------- Co-authored-by: Magnus Singer <magnussinger@icloud.com> Co-authored-by: Dimitris Grammatikogiannis <d.grammatiko@gmail.com> Co-authored-by: Crystal Dionysopoulos <9141288+crystalenka@users.noreply.github.com> Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> Co-authored-by: Denitz <197527+Denitz@users.noreply.github.com> Co-authored-by: Brian Teeman <brian@teeman.net> Co-authored-by: toroworx <toroworx@users.noreply.github.com> Co-authored-by: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Co-authored-by: Jonathan Brain <3941269+BrainforgeUK@users.noreply.github.com> Co-authored-by: Olivier Buisard <olivier.buisard@simplifyyourweb.com> Co-authored-by: Christiane Maier-Stadtherr <dev@chmst.de> Co-authored-by: Manuel Huber <ManuelHu@users.noreply.github.com> Co-authored-by: Nicola Galgano <optimus4joomla@gmail.com> Co-authored-by: Hannes Papenberg <info@joomlager.de> Co-authored-by: Quy <quy@nomonkeybiz.com> Co-authored-by: David Jardin <d.jardin@djumla.de> Co-authored-by: beefcakefu <103491197+beefcakefu@users.noreply.github.com> Co-authored-by: Fedir Zinchuk <getthesite@gmail.com> Co-authored-by: andyforrest <46865032+andyforrest@users.noreply.github.com>

Update StyleModel.php

7894369

Corrected language .ini file handling in child templates.

joomla-cms-bot added the PR-4.3-dev label May 27, 2023

BrainforgeUK mentioned this pull request May 27, 2023

Unexpected message on template admin. #40666

Closed

BrainforgeUK mentioned this pull request May 27, 2023

Update TemplateModel.php #40667

Closed

2 tasks

alikon mentioned this pull request May 27, 2023

Language .ini files in parent templates take preference over those in child templates. #40660

Closed

richard67 reviewed May 28, 2023

View reviewed changes

administrator/components/com_templates/src/Model/StyleModel.php Show resolved Hide resolved

HLeithner added the bug label Jun 3, 2023

Update administrator/components/com_templates/src/Model/StyleModel.php

a174660

Fix PHP code style errors Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Aug 26, 2023

Merge branch '4.3-dev' into patch-11

04618ee

obuisard added this to the Joomla! 4.3.5 milestone Aug 29, 2023

obuisard merged commit 216e277 into joomla:4.3-dev Aug 29, 2023

joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Aug 29, 2023

Quy mentioned this pull request Oct 27, 2023

[5.2.3] Attempt to read property "parent" on array #42236

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Comments

Update StyleModel.php#40665

Update StyleModel.php#40665
obuisard merged 3 commits intojoomla:4.3-devfrom
BrainforgeUK:patch-11

BrainforgeUK commented May 27, 2023

Uh oh!

ChristineWk commented May 27, 2023

Uh oh!

BrainforgeUK commented May 27, 2023

Uh oh!

BrainforgeUK commented May 27, 2023

Uh oh!

brianteeman commented May 27, 2023

Uh oh!

Uh oh!

BrainforgeUK commented Aug 11, 2023

Uh oh!

obuisard commented Aug 14, 2023

Uh oh!

robinclapp commented Aug 26, 2023

Uh oh!

blanderson22 commented Aug 26, 2023

Uh oh!

richard67 commented Aug 26, 2023

Uh oh!

obuisard commented Aug 29, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Comments

Conversation

BrainforgeUK commented May 27, 2023

Summary of Changes

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Link to documentations

Uh oh!

ChristineWk commented May 27, 2023

Uh oh!

BrainforgeUK commented May 27, 2023

Uh oh!

BrainforgeUK commented May 27, 2023

Uh oh!

brianteeman commented May 27, 2023

Uh oh!

Uh oh!

BrainforgeUK commented Aug 11, 2023

Uh oh!

obuisard commented Aug 14, 2023

Uh oh!

robinclapp commented Aug 26, 2023

Uh oh!

blanderson22 commented Aug 26, 2023

Uh oh!

richard67 commented Aug 26, 2023

Uh oh!

obuisard commented Aug 29, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants