tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT: Database will fix itself if you view the site and the database doesn't exist

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72497 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-03-05 04:43:37 +00:00
parent d904c0b8d0
commit a1e48eff8e
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/control/ModelAsController.php
View File

@ -13,6 +13,14 @@ class ModelAsController extends Controller implements NestedController {
$this->urlParams = $request->allParams(); $this->urlParams = $request->allParams();
$this->init(); $this->init();
// If the basic database hasn't been created, then build it.
if(!DB::isActive() || !ClassInfo::hasTable('SiteTree')) {
$this->response = new HTTPResponse();
$this->redirect("dev/build?returnURL=" . urlencode($_GET['url']));
return $this->response;
}
$result = $this->getNestedController(); $result = $this->getNestedController();
if(is_object($result) && $result instanceOf RequestHandler) { if(is_object($result) && $result instanceOf RequestHandler) {

7
core/control/RootURLController.php
View File

@ -19,6 +19,13 @@ class RootURLController extends Controller {
$this->init(); $this->init();
// If the basic database hasn't been created, then build it.
if(!DB::isActive() || !ClassInfo::hasTable('SiteTree')) {
$this->response = new HTTPResponse();
$this->redirect("dev/build?returnURL=");
return $this->response;
}
$controller = new ModelAsController(); $controller = new ModelAsController();
$request = new HTTPRequest("GET", self::get_homepage_urlsegment().'/', $request->getVars(), $request->postVars()); $request = new HTTPRequest("GET", self::get_homepage_urlsegment().'/', $request->getVars(), $request->postVars());

9
core/model/DatabaseAdmin.php
View File

@ -78,7 +78,14 @@ class DatabaseAdmin extends Controller {
ManifestBuilder::create_manifest_file(); ManifestBuilder::create_manifest_file();
require(MANIFEST_FILE); require(MANIFEST_FILE);
$this->doBuild(isset($_REQUEST['quiet']) || isset($_REQUEST['from_installer']), !isset($_REQUEST['dont_populate'])); if(isset($_GET['returnURL'])) {
echo "<p>Setting up the database; you will be returned to your site shortly....</p>";
$this->doBuild(true);
echo "<p>Done!</p>";
Director::redirect($_GET['returnURL']);
} else {
$this->doBuild(isset($_REQUEST['quiet']) || isset($_REQUEST['from_installer']), !isset($_REQUEST['dont_populate']));
}
} }
/** /**