Merge pull request joomla#13422 from Harmageddon/jpath_administrator

Use JPATH_ADMINISTRATOR instead of JPATH_ROOT/administrator.
roland-d · Dec 30, 2016 · 7765af7 · 7765af7
2 parents 0bb6c5c + 31bbb1e
commit 7765af7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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))