From 31bbb1e1a6dc2559a5953bdf85e6c98331abe636 Mon Sep 17 00:00:00 2001 From: Constantin Romankiewicz Date: Fri, 30 Dec 2016 12:49:24 +0100 Subject: [PATCH] Use JPATH_ADMINISTRATOR instead of JPATH_ROOT/administrator. --- administrator/components/com_contenthistory/models/history.php | 2 +- administrator/components/com_menus/models/item.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_contenthistory/models/history.php b/administrator/components/com_contenthistory/models/history.php index f6db2c5f947fa..0a0bb2d6b4856 100644 --- a/administrator/components/com_contenthistory/models/history.php +++ b/administrator/components/com_contenthistory/models/history.php @@ -369,7 +369,7 @@ protected function getSha1Hash() $typeId = JFactory::getApplication()->input->getInteger('type_id', 0); $typeTable->load($typeId); $typeAliasArray = explode('.', $typeTable->type_alias); - JTable::addIncludePath(JPATH_ROOT . '/administrator/components/' . $typeAliasArray[0] . '/tables'); + JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/' . $typeAliasArray[0] . '/tables'); $contentTable = $typeTable->getContentTable(); $keyValue = JFactory::getApplication()->input->getInteger('item_id', 0); diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php index ab6adfcfcc48f..7a78952cea1fa 100644 --- a/administrator/components/com_menus/models/item.php +++ b/administrator/components/com_menus/models/item.php @@ -1106,7 +1106,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') else { // We don't have a component. Load the form XML to get the help path - $xmlFile = JPath::find(JPATH_ROOT . '/administrator/components/com_menus/models/forms', 'item_' . $type . '.xml'); + $xmlFile = JPath::find(JPATH_ADMINISTRATOR . '/components/com_menus/models/forms', 'item_' . $type . '.xml'); // Attempt to load the xml file. if ($xmlFile && !$xml = simplexml_load_file($xmlFile))