Merge remote-tracking branch 'upstream/master' into fguillot/kanboard

1 files changed, 12 insertions, 0 deletions

diff --git a/app/common.php b/app/common.php
index bd336d92..a434a73f 100644
--- a/app/common.php
+++ b/app/common.php
@@ -2,6 +2,18 @@
 
 require 'vendor/autoload.php';
 
+// Automatically parse environment configuration (Heroku)
+if (getenv('DATABASE_URL')) {
+
+    $dbopts = parse_url(getenv('DATABASE_URL'));
+
+    define('DB_DRIVER', $dbopts['scheme']);
+    define('DB_USERNAME', $dbopts["user"]);
+    define('DB_PASSWORD', $dbopts["pass"]);
+    define('DB_HOSTNAME', $dbopts["host"]);
+    define('DB_NAME', ltrim($dbopts["path"],'/'));
+}
+
 // Include custom config file
 if (file_exists('config.php')) {
     require 'config.php';