Merge branch 'nested-form' into staging

* nested-form: Delete unnecesary catslug query from mod_related_items (#8946)
joomla · Nov 13, 2016 · eb4ddb4 · eb4ddb4
2 parents 90d218b + c83d6c4
commit eb4ddb4
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default.php
@@ -32,12 +32,13 @@
 ?>
 
 <div id="joomlaupdate-wrapper">
-	<form enctype="multipart/form-data" action="index.php" method="post" id="adminForm" class="form-horizontal">
 
-		<?php if ($this->showUploadAndUpdate) : ?>
-			<?php echo JHtml::_('bootstrap.startTabSet', 'joomlaupdate-tabs', array('active' => 'online-update')); ?>
-			<?php echo JHtml::_('bootstrap.addTab', 'joomlaupdate-tabs', 'online-update', JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_ONLINE')); ?>
-		<?php endif; ?>
+	<?php if ($this->showUploadAndUpdate) : ?>
+		<?php echo JHtml::_('bootstrap.startTabSet', 'joomlaupdate-tabs', array('active' => 'online-update')); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'joomlaupdate-tabs', 'online-update', JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_ONLINE')); ?>
+	<?php endif; ?>
+
+	<form enctype="multipart/form-data" action="index.php" method="post" id="adminForm" class="form-horizontal">
 
 		<?php if ($this->selfUpdate) : ?>
 			<?php // If we have a self update notice to install it first! ?>