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

[3.10] Correctly handle multiple critical extensions within an package that is joomla 4 compatible #34776

Merged
merged 10 commits into from
Jul 22, 2021
18 changes: 11 additions & 7 deletions media/com_joomlaupdate/js/default.js
Original file line number Diff line number Diff line change
@@ -285,13 +285,17 @@ function extractionMethodHandler(target, prefix)
// Process the nonCoreCriticalPlugin list
if (extensionData.compatibilityData.resultGroup === 3)
{
for (var cpi in PreUpdateChecker.nonCoreCriticalPlugins)
var pluginInfo;

for (var i = PreUpdateChecker.nonCoreCriticalPlugins.length - 1; i >= 0; i--)
{
if(PreUpdateChecker.nonCoreCriticalPlugins[cpi].package_id == extensionId || PreUpdateChecker.nonCoreCriticalPlugins[cpi].extension_id == extensionId)
{
$('#plg_' + PreUpdateChecker.nonCoreCriticalPlugins[cpi].extension_id).remove();
PreUpdateChecker.nonCoreCriticalPlugins.splice(cpi,1);
}
pluginInfo = PreUpdateChecker.nonCoreCriticalPlugins[i];

if (pluginInfo.package_id == extensionId || pluginInfo.extension_id == extensionId)
{
$('#plg_' + pluginInfo.extension_id).remove();
PreUpdateChecker.nonCoreCriticalPlugins.splice(i, 1);
}
}
}

@@ -321,7 +325,7 @@ function extractionMethodHandler(target, prefix)
+ Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN')
+ '</span>'

+ '<span class="label label-important hasPopover" '
+ '<span class="label label-info hasPopover" '
+ ' title="' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN') +'"'
+ ' data-content="' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_DESC') +'"'
+ '>'
2 changes: 1 addition & 1 deletion media/com_joomlaupdate/js/default.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.