Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / DB.php

diff --git a/lib/DB.php b/lib/DB.php
index 2b53dba8254dbd230630a1a41ceefb02d4221cff..0454a0ff6190567f57acd6d19f46817759ebf7b4 100644 (file)
--- a/lib/DB.php
+++ b/lib/DB.php
@@ -12,9 +12,9 @@ class DB
 {
     protected $connection;
 
 {
     protected $connection;
 

-    public function __construct($sDSN = CONST_Database_DSN)
+    public function __construct($sDSN = null)

     {
     {

-        $this->sDSN = $sDSN;
+        $this->sDSN = $sDSN ?? getSetting('DATABASE_DSN');

     }
 
     public function connect($bNew = false, $bPersistent = true)
     }
 
     public function connect($bNew = false, $bPersistent = true)