Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index acdb31c45272d08c66540e796ec67857de974a6c..b6dc89c49157ddd16072a829221f5d6193c9ef5b 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -1,10 +1,10 @@
 <?php
        require_once('DB.php');
 
 <?php
        require_once('DB.php');
 

-       function &getDB($bNew = false)
+       function &getDB($bNew = false, $bPersistent = false)

        {
                // Get the database object
        {
                // Get the database object

-               $oDB =& DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), false);
+               $oDB =& DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);

                if (PEAR::IsError($oDB))
                {
                        var_dump(CONST_Database_DSN);
                if (PEAR::IsError($oDB))
                {
                        var_dump(CONST_Database_DSN);