move setup controller to core/controller

This commit is contained in:
Morris Jobke 2016-01-20 10:20:36 +01:00
parent b97fe97875
commit 06fe4cabfc
2 changed files with 3 additions and 3 deletions

View File

@ -25,11 +25,11 @@
* *
*/ */
namespace OC\Core\Setup; namespace OC\Core\Controller;
use OC\Setup; use OC\Setup;
class Controller { class SetupController {
/** @var Setup */ /** @var Setup */
protected $setupHelper; protected $setupHelper;
/** @var string */ /** @var string */

View File

@ -826,7 +826,7 @@ class OC {
$setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(), $setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(),
\OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(), \OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(),
\OC::$server->getSecureRandom()); \OC::$server->getSecureRandom());
$controller = new OC\Core\Setup\Controller($setupHelper); $controller = new OC\Core\Controller\SetupController($setupHelper);
$controller->run($_POST); $controller->run($_POST);
exit(); exit();
} }