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

Merge pull request #2033 from sminnee/better-no-db-error

Browse Source 
NEW: More helpful message for 'sake dev/build' on new envs.
This commit is contained in:
Sean Harvey 2013-05-29 21:57:29 -07:00
commit 1c7b4a0cab
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/_config.php
View File

@ -6,7 +6,7 @@ HtmlEditorConfig::get('cms')->setOptions(array(
'mode' => 'none', // initialized through LeftAndMain.EditFor.js logic 'mode' => 'none', // initialized through LeftAndMain.EditFor.js logic
'body_class' => 'typography', 'body_class' => 'typography',
'document_base_url' => Director::absoluteBaseURL(), 'document_base_url' => isset($_SERVER['HTTP_HOST']) ? Director::absoluteBaseURL() : null,
'cleanup_callback' => "sapphiremce_cleanup", 'cleanup_callback' => "sapphiremce_cleanup",

35
cli-script.php
View File

@ -68,10 +68,43 @@ global $databaseConfig;
// We don't have a session in cli-script, but this prevents errors // We don't have a session in cli-script, but this prevents errors
$_SESSION = null; $_SESSION = null;
// Connect to database
require_once("model/DB.php"); require_once("model/DB.php");
// Connect to database
if(!isset($databaseConfig) || !isset($databaseConfig['database']) || !$databaseConfig['database']) {
echo "\nPlease configure your database connection details. You can do this by creating a file
called _ss_environment.php in either of the following locations:\n\n";
echo " - " . BASE_PATH ."_ss_environment.php\n - " . dirname(BASE_PATH) . "_ss_environment.php\n\n";
echo <<<ENVCONTENT
Put the following content into this file:
--------------------------------------------------
<?php
/* Change this from 'dev' to 'live' for a production environment. */
define('SS_ENVIRONMENT_TYPE', 'dev');
/* This defines a default database user */
define('SS_DATABASE_SERVER', 'localhost');
define('SS_DATABASE_USERNAME', '<user>');
define('SS_DATABASE_PASSWORD', '<password>');
define('SS_DATABASE_NAME', '<database>');
--------------------------------------------------
Once you have done that, run 'composer install' or './framework/sake dev/build' to create
an empty database.
For more information, please read this page in our docs:
http://doc.silverstripe.org/framework/en/topics/environment-management
ENVCONTENT;
exit(1);
}
DB::connect($databaseConfig); DB::connect($databaseConfig);
// Get the request URL from the querystring arguments // Get the request URL from the querystring arguments
$url = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : null; $url = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : null;
if(!$url) { if(!$url) {