extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-24 15:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

* API: if re-connect to database fails for an existing session, stop execution with an exception, as otherwise eg. preferences can get lost

Browse Source
This commit is contained in:
Ralf Becker 2013-06-20 13:42:19 +00:00
parent ccb65bb2c8
commit 8f6f31dbb3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/inc/class.egw_db.inc.php
View File

@ -452,7 +452,12 @@ class egw_db
$this->Link_ID =& $GLOBALS['egw']->ADOdb;
}
}
if (!$this->Link_ID->isConnected()) $this->Link_ID->Connect();
if (!$this->Link_ID->isConnected() && !$this->Link_ID->Connect())
{
$Host = preg_replace('/password=[^ ]+/','password=$Password',$this->Host); // eg. postgres dsn contains password
$this->halt("ADOdb::$connect($Host, $this->User, \$Password, $this->Database) reconnect failed.");
return null; // in case error-reporting = 'no'
}
if ($new_connection)
{