From 1c909fedf4cfc700bf92eeafb0624159171381e2 Mon Sep 17 00:00:00 2001 From: Mark Newnham Date: Mon, 29 Mar 2021 19:29:27 -0600 Subject: remove _cacheType variable lookup Lookup for auto blob decoding uses standard $fieldObjects instead of custom array --- drivers/adodb-firebird.inc.php | 15 +++------------ 1 file 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; -- cgit v1.3