summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Newnham <mark@newnhams.com>2021-03-29 19:29:27 -0600
committerDamien Regad <dregad@mantisbt.org>2021-08-22 11:17:48 +0200
commit1c909fedf4cfc700bf92eeafb0624159171381e2 (patch)
treec8db90e0024b15f0fd2a10e5d07232e8251b76a0
parentc00e1720305467d76ac7e18e05470e8e2804801c (diff)
downloadadodb-1c909fedf4cfc700bf92eeafb0624159171381e2.tar.gz
adodb-1c909fedf4cfc700bf92eeafb0624159171381e2.tar.bz2
adodb-1c909fedf4cfc700bf92eeafb0624159171381e2.zip
remove _cacheType variable lookup
Lookup for auto blob decoding uses standard $fieldObjects instead of custom array
-rw-r--r--drivers/adodb-firebird.inc.php15
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/adodb-firebird.inc.php b/drivers/adodb-firebird.inc.php
index d970b98e..f9b8239f 100644
--- a/drivers/adodb-firebird.inc.php
+++ b/drivers/adodb-firebird.inc.php
@@ -999,7 +999,6 @@ class ADORecordset_firebird extends ADORecordSet
var $databaseType = "firebird";
var $bind=false;
- var $_cacheType;
/*
* Holds a cached version of the metadata
@@ -1101,13 +1100,6 @@ class ADORecordset_firebird extends ADORecordSet
$this->fieldObjects[$fieldOffset] = $fld;
$this->fieldObjectsIndex[$fld->name] = $fieldOffset;
-
- /*
- *cache types for blob decode check. We could look
- * at $fieldObjects instead
- */
- $this->_cacheType[] = $ibf['type'];
-
}
if ($fieldOffset == -1)
@@ -1164,11 +1156,10 @@ class ADORecordset_firebird extends ADORecordSet
global $ADODB_ANSI_PADDING_OFF;
//$ADODB_ANSI_PADDING_OFF=1;
$rtrim = !empty($ADODB_ANSI_PADDING_OFF);
-
+
for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
- if ($this->_cacheType[$i]=="BLOB") {
- if (isset($f[$i]))
- {
+ if ($this->fieldObjects[$i]->type=="BLOB") {
+ if (isset($f[$i])) {
$f[$i] = $this->connection->_BlobDecode($f[$i]);
} else {
$f[$i] = null;