session

joomla · Jul 20, 2017 · e7135cf · e7135cf
1 parent 65bd548
commit e7135cf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/installation/controller/install/dbcheck.php b/installation/controller/install/dbcheck.php
@@ -30,7 +30,7 @@ public function execute()
 		$app = $this->getApplication();
 
 		// Check for request forgeries.
-		JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
+		// JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
 
 		// Redirect to the page.
 		$r = new stdClass;

diff --git a/installation/template/js/setup.js b/installation/template/js/setup.js
@@ -345,9 +345,10 @@ if (document.getElementById('step2')) {
 		if (document.getElementById('installStep3')) {
 			document.getElementById('installStep3').removeAttribute('hidden');
 			document.getElementById('installStep3').classList.add('active');
-			document.getElementById('step2').parentNode.removeChild(document.getElementById('step2'))
+			document.getElementById('step2').parentNode.removeChild(document.getElementById('step2'));
 			document.querySelector('li[data-step="3"]').classList.add('active');
 			document.getElementById('installStep3').scrollIntoView();
+			document.getElementById('setupButton').style.display = 'block';
 		}
 	})
 }

diff --git a/installation/view/setup/tmpl/default.php b/installation/view/setup/tmpl/default.php
@@ -107,7 +107,7 @@
 			</div>
 
 			<div class="col-md-8 offset-md-2 justify-content-end d-flex form-group">
-				<a class="btn btn-success" onclick="Joomla.checkInputs()" ?><?php echo JText::_('Install'); ?> <span class="fa fa-chevron-right" aria-hidden="true"></span></a>
+				<a class="btn btn-success" id="setupButton" onclick="Joomla.checkInputs()" style="display:none"><?php echo JText::_('Install'); ?> <span class="fa fa-chevron-right" aria-hidden="true"></span></a>
 			</div>
 
 			<input type="hidden" name="admin_password2" id="jform_admin_password2">