From edd4160e311aaf29e6a2cda06e4624d7ffc18c28 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Fri, 20 Jul 2018 08:26:21 +0530
Subject: [PATCH 1/2] fix error

---
 .../components/com_templates/tmpl/style/edit.php | 16 ++++++++--------
 layouts/joomla/form/field/media.php              |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/style/edit.php b/administrator/components/com_templates/tmpl/style/edit.php
index 51a534d5ff360..59a6dabe5891b 100644
--- a/administrator/components/com_templates/tmpl/style/edit.php
+++ b/administrator/components/com_templates/tmpl/style/edit.php
@@ -23,9 +23,9 @@
 	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
 
 	<div>
-		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+		<?php echo JHtml::_('uitab.startTabSet', 'myTab', array('active' => 'details')); ?>
 
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('JDETAILS')); ?>
+		<?php echo JHtml::_('uitab.addTab', 'myTab', 'details', JText::_('JDETAILS')); ?>
 
 		<div class="row">
 			<div class="col-md-9">
@@ -73,12 +73,12 @@
 				</div>
 			</div>
 		</div>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php echo JHtml::_('uitab.endTab'); ?>
 
 		<?php if ($description) : ?>
-			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'description', JText::_('JGLOBAL_FIELDSET_DESCRIPTION')); ?>
+			<?php echo JHtml::_('uitab.addTab', 'myTab', 'description', JText::_('JGLOBAL_FIELDSET_DESCRIPTION')); ?>
 			<?php echo $description; ?>
-			<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php echo JHtml::_('uitab.endTab'); ?>
 		<?php endif; ?>
 
 		<?php
@@ -88,12 +88,12 @@
 		?>
 
 		<?php if ($user->authorise('core.edit', 'com_menus') && $this->item->client_id == 0 && $this->canDo->get('core.edit.state')) : ?>
-			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'assignment', JText::_('COM_TEMPLATES_MENUS_ASSIGNMENT')); ?>
+			<?php echo JHtml::_('uitab.addTab', 'myTab', 'assignment', JText::_('COM_TEMPLATES_MENUS_ASSIGNMENT')); ?>
 			<?php echo $this->loadTemplate('assignment'); ?>
-			<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php echo JHtml::_('uitab.endTab'); ?>
 		<?php endif; ?>
 
-		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		<?php echo JHtml::_('uitab.endTabSet'); ?>
 
 		<input type="hidden" name="task" value="">
 		<?php echo JHtml::_('form.token'); ?>
diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php
index a6cea37945e6b..76737a213a104 100644
--- a/layouts/joomla/form/field/media.php
+++ b/layouts/joomla/form/field/media.php
@@ -100,7 +100,7 @@
 	: ($link ? $link
 		: 'index.php?option=com_media&amp;tmpl=component&amp;asset='
 		. $asset . '&amp;author=' . $authorId)
-	. '&amp;fieldid={field-media-id}&amp;path=' . $folder);
+	. '&amp;fieldid={field-media-id}&amp;path=local-0:/' . $folder);
 ?>
 <joomla-field-media class="field-media-wrapper"
 		type="image" <?php // @TODO add this attribute to the field in order to use it for all media types ?>

From 50a78b7677027f7383ca643348f97608003c8938 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Fri, 20 Jul 2018 08:28:23 +0530
Subject: [PATCH 2/2] revert

---
 .../components/com_templates/tmpl/style/edit.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/style/edit.php b/administrator/components/com_templates/tmpl/style/edit.php
index 59a6dabe5891b..51a534d5ff360 100644
--- a/administrator/components/com_templates/tmpl/style/edit.php
+++ b/administrator/components/com_templates/tmpl/style/edit.php
@@ -23,9 +23,9 @@
 	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
 
 	<div>
-		<?php echo JHtml::_('uitab.startTabSet', 'myTab', array('active' => 'details')); ?>
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
 
-		<?php echo JHtml::_('uitab.addTab', 'myTab', 'details', JText::_('JDETAILS')); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('JDETAILS')); ?>
 
 		<div class="row">
 			<div class="col-md-9">
@@ -73,12 +73,12 @@
 				</div>
 			</div>
 		</div>
-		<?php echo JHtml::_('uitab.endTab'); ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
 		<?php if ($description) : ?>
-			<?php echo JHtml::_('uitab.addTab', 'myTab', 'description', JText::_('JGLOBAL_FIELDSET_DESCRIPTION')); ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'description', JText::_('JGLOBAL_FIELDSET_DESCRIPTION')); ?>
 			<?php echo $description; ?>
-			<?php echo JHtml::_('uitab.endTab'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
 
 		<?php
@@ -88,12 +88,12 @@
 		?>
 
 		<?php if ($user->authorise('core.edit', 'com_menus') && $this->item->client_id == 0 && $this->canDo->get('core.edit.state')) : ?>
-			<?php echo JHtml::_('uitab.addTab', 'myTab', 'assignment', JText::_('COM_TEMPLATES_MENUS_ASSIGNMENT')); ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'assignment', JText::_('COM_TEMPLATES_MENUS_ASSIGNMENT')); ?>
 			<?php echo $this->loadTemplate('assignment'); ?>
-			<?php echo JHtml::_('uitab.endTab'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
 
-		<?php echo JHtml::_('uitab.endTabSet'); ?>
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
 
 		<input type="hidden" name="task" value="">
 		<?php echo JHtml::_('form.token'); ?>