Skip to content

[4.3] Fix invalid json in params of com_templates after update to 4.3.0 or 4.3.1 caused by PR #38823 #40535

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
May 7, 2023
Merged

[4.3] Fix invalid json in params of com_templates after update to 4.3.0 or 4.3.1 caused by PR #38823 #40535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a339849
Add new update SQL scripts to fix invalid json
richard67 May 3, 2023
eeb474f
Set to empty json
richard67 May 3, 2023
8470a61
Remove the SQL statement which broke it
richard67 May 3, 2023
a61f350
Fix typo from PR #38823 in parameter default
richard67 May 5, 2023
c552080
Don't set to empty JSON
richard67 May 5, 2023
e10d7d7
Merge branch '4.3-dev' into 4.3-dev-fix-invalid-json-params-from-pr-3…
richard67 May 5, 2023
cc4097e
Fix also empty JSON and empty string
richard67 May 7, 2023
1c85bb0
Merge branch '4.3-dev' into 4.3-dev-fix-invalid-json-params-from-pr-3…
richard67 May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions administrator/components/com_admin/sql/updates/mysql/4.3.0-2022-09-23.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-- Update the com_templates options to add the diff options
UPDATE `#__extensions` SET `params` = REPLACE(`params`, '}', ',"difference":"SideBySide"}') WHERE `name` = 'com_templates';
-- The SQL statement had to be removed, see https://github.com/joomla/joomla-cms/pull/40535
3 changes: 3 additions & 0 deletions administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-05-03.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
UPDATE `#__extensions`
SET `params` = '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png,webp","source_formats":"txt,less,ini,xml,js,php,css,scss,sass,json","font_formats":"woff,woff2,ttf,otf","compressed_formats":"zip","difference":"SideBySide"}'
WHERE `name` = 'com_templates' AND `params` IN ('{,"difference":"SideBySide"}', '{}', '');
3 changes: 1 addition & 2 deletions administrator/components/com_admin/sql/updates/postgresql/4.3.0-2022-09-23.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-- Update the com_templates options to add the diff options
UPDATE "#__extensions" SET "params" = REPLACE("params", '}', ',"difference":"SideBySide"}') WHERE "name" = 'com_templates';
-- The SQL statement had to be removed, see https://github.com/joomla/joomla-cms/pull/40535
3 changes: 3 additions & 0 deletions administrator/components/com_admin/sql/updates/postgresql/4.3.0-2023-05-03.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
UPDATE "#__extensions"
SET "params" = '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png,webp","source_formats":"txt,less,ini,xml,js,php,css,scss,sass,json","font_formats":"woff,woff2,ttf,otf","compressed_formats":"zip","difference":"SideBySide"}'
WHERE "name" = 'com_templates' AND "params" IN ('{,"difference":"SideBySide"}', '{}', '');
2 changes: 1 addition & 1 deletion administrator/components/com_templates/tmpl/template/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
$difference = DiffHelper::calculateFiles(
$this->source->coreFile,
$this->source->filePath,
ComponentHelper::getParams('com_templates')->get('difference', 'SideByside'),
ComponentHelper::getParams('com_templates')->get('difference', 'SideBySide'),
[
'context' => 1,
'ignoreLineEnding' => true,
Expand Down