Fix javascript error for pre-update checker (#35481)

joomdonation · web-flow · commit 742de2e8b2a6 · 2021-09-04T20:37:44.000+02:00
diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php
@@ -14,7 +14,7 @@
 // JText::script doesn't have a sprintf equivalent so work around this
 JFactory::getDocument()->addScriptDeclaration("var COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION = '" . JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-right small"></span>', true) . "';");
 JFactory::getDocument()->addScriptDeclaration("var COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION = '" . JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-up small"></span>', true) . "';");
-JFactory::getDocument()->addScriptDeclaration("var nonCoreCriticalPlugins = '" . json_encode($this->nonCoreCriticalPlugins) . "';");
+JFactory::getDocument()->addScriptOptions('nonCoreCriticalPlugins', array_values($this->nonCoreCriticalPlugins));
 
 $compatibilityTypes = array(
 	'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS' => array(
diff --git a/media/com_joomlaupdate/js/default.js b/media/com_joomlaupdate/js/default.js
@@ -75,7 +75,7 @@ function extractionMethodHandler(target, prefix)
 			}
 		});
 
-		PreUpdateChecker.nonCoreCriticalPlugins = typeof nonCoreCriticalPlugins !== 'undefined' ? Object.values(JSON.parse(nonCoreCriticalPlugins)) : [];
+		PreUpdateChecker.nonCoreCriticalPlugins = Joomla.getOptions('nonCoreCriticalPlugins', []);
 
 		// If there are no non Core Critical Plugins installed then disable the warnings upfront
 		if (PreUpdateChecker.nonCoreCriticalPlugins.length === 0)
diff --git a/media/com_joomlaupdate/js/default.min.js b/media/com_joomlaupdate/js/default.min.js

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ function extractionMethodHandler(target, prefix)`
`75`	`75`	`}`
`76`	`76`	`});`
`77`	`77`
`78`		`- PreUpdateChecker.nonCoreCriticalPlugins = typeof nonCoreCriticalPlugins !== 'undefined' ? Object.values(JSON.parse(nonCoreCriticalPlugins)) : [];`
	`78`	`+ PreUpdateChecker.nonCoreCriticalPlugins = Joomla.getOptions('nonCoreCriticalPlugins', []);`
`79`	`79`
`80`	`80`	`// If there are no non Core Critical Plugins installed then disable the warnings upfront`
`81`	`81`	`if (PreUpdateChecker.nonCoreCriticalPlugins.length === 0)`