Merge pull request #11226 from owncloud/kill-postsetupcheck-master

remove post setup check

2 files changed, 3 insertions, 9 deletions

diff --git a/core/routes.php b/core/routes.php
index fac67f23175..a9d5387bc14 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -20,9 +20,6 @@ $application->registerRoutes($this, array('routes' => array(
 // Post installation check
 
 /** @var $this OCP\Route\IRouter */
-$this->create('post_setup_check', '/post-setup-check')
-	->action('OC_Setup', 'postSetupCheck');
-
 // Core ajax actions
 // Search
 $this->create('search_ajax_search', '/search/ajax/search.php')
diff --git a/core/setup/controller.php b/core/setup/controller.php
index 5da94e83ccc..02226ad9e42 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -22,12 +22,10 @@ class Controller {
 			if(count($e) > 0) {
 				$options = array_merge($opts, $post, $errors);
 				$this->display($options);
-			}
-			else {
+			} else {
 				$this->finishSetup();
 			}
-		}
-		else {
+		} else {
 			$options = array_merge($opts, $post);
 			$this->display($options);
 		}
@@ -53,8 +51,7 @@ class Controller {
 	}
 
 	public function finishSetup() {
-		header( 'Location: '.\OC_Helper::linkToRoute( 'post_setup_check' ));
-		exit();
+		\OC_Util::redirectToDefaultPage();
 	}
 
 	public function loadAutoConfig($post) {