Merge remote-tracking branch 'origin/0.1'

Conflicts: composer.json
2013-06-04 15:01:30 +02:00 · 2013-06-04 15:01:30 +02:00 · bded32a90b
parent cfae50d585 9a8d24c116
commit bded32a90b
2 changed files with 5 additions and 2 deletions
--- a/_config.php
+++ b/_config.php
@ -1,5 +1,8 @@
 <?php
-if(DB::get_alternative_database_name()) {
+if(
+  Config::inst()->get('Security', 'token')
+  && DB::get_alternative_database_name()
+) {
  require_once BASE_PATH . '/vendor/autoload.php';
 	
 	// Register mailer
--- a/composer.json
+++ b/composer.json
@ -18,4 +18,4 @@
 		"silverstripe/behat-extension": "*"
 	},
 	"minimum-stability": "dev"
-}
+	}