Skip to content

[4.1] Fix the upgrade path #36585

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 17 commits into from
Jan 25, 2022
Merged

[4.1] Fix the upgrade path #36585

Changes from 9 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
acb2f98
Use a function for the new mode
dgrammatiko Jan 6, 2022
77ae2cc
cs
dgrammatiko Jan 6, 2022
18b2f17
ctrl+z
dgrammatiko Jan 6, 2022
075f797
CS
dgrammatiko Jan 6, 2022
172d057
int
dgrammatiko Jan 6, 2022
84c17cd
order please
dgrammatiko Jan 6, 2022
5d671e6
Merge branch '4.1-dev' into 4.1/update
dgrammatiko Jan 6, 2022
c372b47
int
dgrammatiko Jan 6, 2022
3bf7f17
Merge branch '4.1-dev' into 4.1/update
dgrammatiko Jan 6, 2022
541456d
Update administrator/components/com_admin/script.php
dgrammatiko Jan 7, 2022
ca3738f
Update administrator/components/com_admin/script.php
dgrammatiko Jan 7, 2022
3b754cd
Move fixTemplateMode to preflight
richard67 Jan 24, 2022
454de07
Set inheritable and parent columns in 4.0.0-2018-03-05.sql
richard67 Jan 24, 2022
bc357f9
Add comment about the change to 4.0.0-2018-03-05.sql
richard67 Jan 24, 2022
2ff1dfc
Merge pull request #10 from richard67/4.1-dev-dgrammatiko-4.1-update-…
dgrammatiko Jan 24, 2022
73b97af
Merge branch '4.1-dev' into 4.1/update
richard67 Jan 24, 2022
f77dfc4
Merge branch '4.1-dev' into 4.1/update
laoneo Jan 25, 2022
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
39 changes: 39 additions & 0 deletions administrator/components/com_admin/script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ public function update($installer)
$this->deleteUnexistingFiles();
$this->updateManifestCaches();
$this->updateDatabase();

// Ensure templates are moved to the correct mode
$this->fixTemplateMode();
$this->updateAssets($installer);
$this->clearStatsCache();
$this->convertTablesToUtf8mb4(true);
Expand Down Expand Up @@ -8533,4 +8536,40 @@ protected function moveRemainingTemplateFiles()
}
}
}

/**
* Ensure the core templates are correctly moved to the new mode.
*
* @return void
*
* @since __DEPLOY_VERSION__
*/
protected function fixTemplateMode()
{
$db = Factory::getDbo();

array_map(

This comment was marked as abuse.

Sign in to view

Copy link
Contributor Author

@dgrammatiko dgrammatiko Jan 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

functional programming? No real reason, it's a bit shorter

This comment was marked as abuse.

Sign in to view

Copy link
Contributor Author

@dgrammatiko dgrammatiko Jan 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't believe everything you find on the internet :)

FWIW browsers (JS) are optimizing for these functions and I would expect PHP would be doing that as well but for PHP I don't have any data...

Edit: actually this comment aligns with what I wrote ;)

This comment was marked as abuse.

Sign in to view

Copy link
Contributor Author

@dgrammatiko dgrammatiko Jan 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Functional programming is very popular in the JS space and the reason is because React, Vue, Svelte, etc basically made the UI a function of the state UI = Fn(state)

This comment was marked as abuse.

Sign in to view

Copy link
Contributor Author

@dgrammatiko dgrammatiko Jan 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hate that I can't use the spread operator yet...

This comment was marked as abuse.

Sign in to view

function ($template) use ($db)
{
$clientId = $template === 'atum' ? 1 : 0;
$query = $db->getQuery(true)
->update($db->quoteName('#__template_styles'))
->set($db->quoteName('inheritable') . ' = 1')
->where($db->quoteName('template') . ' = ' . $db->quote($template))
->where($db->quoteName('client_id') . ' = ' . $clientId);

try
{
$db->setQuery($query)->execute();
}
catch (Exception $e)
{
echo Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br>';

return;
}
},
['atum', 'cassiopeia']
);
}
}