Merge branch 'hotfix/5.22'

ADOdb · Apr 16, 2023 · 5e734b0 · 5e734b0
2 parents 1a008f9 + b881dea
commit 5e734b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/adodb-csvlib.inc.php b/adodb-csvlib.inc.php
@@ -80,7 +80,6 @@ function _rs2serialize(&$rs,$conn=false,$sql='')
 		$rs2 = new $class(ADORecordSet::DUMMY_QUERY_ID);
 		$rs2->timeCreated = $rs->timeCreated; # memcache fix
 		$rs2->sql = $rs->sql;
-		$rs2->oldProvider = $rs->dataProvider;
 		$rs2->InitArrayFields($rows,$flds);
 		$rs2->fetchMode = $savefetch;
 		return $line.serialize($rs2);

diff --git a/drivers/adodb-postgres64.inc.php b/drivers/adodb-postgres64.inc.php
@@ -272,7 +272,9 @@ function qStr($s, $magic_quotes=false)
 		if ($this->_connectionID) {
 			return "'" . pg_escape_string($this->_connectionID, $s) . "'";
 		} else {
-			return "'" . pg_escape_string($s) . "'";
+			// Fall back to emulated escaping when there is no database connection.
+			// Avoids errors when using setSessionVariables() in the load balancer.
+			return parent::qStr( $s );
 		}
 	}