diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php index c255900616ddb..fd611ca20f7f0 100644 --- a/administrator/components/com_menus/helpers/menus.php +++ b/administrator/components/com_menus/helpers/menus.php @@ -178,7 +178,8 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0, a.template_style_id, a.checked_out, a.language, - a.lft') + a.lft, + a.params') ->from('#__menu AS a'); $query->select('e.name as componentname, e.element') diff --git a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php index f6d2899f99ae4..ad65fcb0938bd 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php +++ b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Registry\Registry; + // Initialise related data. JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); $menuTypes = MenusHelper::getMenuLinks(); @@ -84,6 +86,16 @@ function menuHide(val) links as $i => $link) : ?> loadString($link->params); + } + catch(Exception $e) + { + // invalid JSON + } + $link->params = $registry; if ($prevlevel < $link->level) { echo '