diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php index 69ea528e02078..4f27f32538505 100644 --- a/administrator/components/com_menus/models/item.php +++ b/administrator/components/com_menus/models/item.php @@ -904,9 +904,6 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') $base = JPATH_SITE . '/components/' . $option; } - // Confirm a view is defined. - $formFile = false; - if (isset($args['view'])) { $view = $args['view']; @@ -921,8 +918,6 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') $layout = 'default'; } - $formFile = false; - // Check for the layout XML file. Use standard xml file if it exists. $tplFolders = array( $base . '/views/' . $view . '/tmpl', @@ -1023,26 +1018,6 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') $this->helpLocal = (($helpLoc == 'true') || ($helpLoc == '1') || ($helpLoc == 'local')) ? true : false; } - // Now load the component params. - // TODO: Work out why 'fixing' this breaks JForm - if ($isNew = false) - { - $path = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $option . '/config.xml'); - } - else - { - $path = 'null'; - } - - if (is_file($path)) - { - // Add the component params last of all to the existing form. - if (!$form->load($path, true, '/config')) - { - throw new Exception(JText::_('JERROR_LOADFILE_FAILED')); - } - } - // Load the specific type file if (!$form->loadFile('item_' . $type, false, false)) {