holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

status value is in column 1 (2. column), also fixed not working fetchColumn

Browse Source
This commit is contained in:
Ralf Becker 2015-07-14 10:44:12 +00:00
parent 3470f4d51c
commit b318f1e4f4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/adodb/adodb.inc.php
View File

@ -3441,6 +3441,8 @@
while ($column_number-- >= 0) while ($column_number-- >= 0)
{ {
$ret = array_shift($row); $ret = array_shift($row);
if ($this->fetchMode == ADODB_FETCH_BOTH) array_shift($row);
} }
return $ret; return $ret;
} }

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

@ -352,7 +352,7 @@ class egw_db
// check Galera wsrep_local_state for node is not in state Synced, eg. Donor // check Galera wsrep_local_state for node is not in state Synced, eg. Donor
// check is only done for Type=mysql and will succed if no Galera // check is only done for Type=mysql and will succed if no Galera
if ($new_connection && $this->Type == 'mysql' && strpos($this->Host, ';') !== false && if ($new_connection && $this->Type == 'mysql' && strpos($this->Host, ';') !== false &&
($state = $this->query("SHOW STATUS LIKE 'wsrep_local_state'")->fetchColumn() !== false) && ($state = $this->query("SHOW STATUS LIKE 'wsrep_local_state'")->fetchColumn(1) !== false) &&
$state != 4) // 4 = Synced $state != 4) // 4 = Synced
{ {
throw new egw_exception_db_connection('wsrep-local-state='.array2string($state).' != 4'); throw new egw_exception_db_connection('wsrep-local-state='.array2string($state).' != 4');