summaryrefslogtreecommitdiff
path: root/adodb-lib.inc.php
diff options
context:
space:
mode:
Diffstat (limited to 'adodb-lib.inc.php')
-rw-r--r--adodb-lib.inc.php19
1 files changed, 6 insertions, 13 deletions
diff --git a/adodb-lib.inc.php b/adodb-lib.inc.php
index ca07001b..8d441cc6 100644
--- a/adodb-lib.inc.php
+++ b/adodb-lib.inc.php
@@ -465,18 +465,11 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr);
}
if ($rstest) {
- $qryRecs = $rstest->RecordCount();
+ $qryRecs = $rstest->RecordCount();
if ($qryRecs == -1) {
- global $ADODB_EXTENSION;
- // some databases will return -1 on MoveLast() - change to MoveNext()
- if ($ADODB_EXTENSION) {
- while(!$rstest->EOF) {
- adodb_movenext($rstest);
- }
- } else {
- while(!$rstest->EOF) {
- $rstest->MoveNext();
- }
+ // some databases will return -1 on MoveLast() - change to MoveNext()
+ while(!$rstest->EOF) {
+ $rstest->MoveNext();
}
$qryRecs = $rstest->_currentRow;
}
@@ -905,7 +898,7 @@ static $cacheCols;
$values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields, $magicq);
}
break;
-
+
case ADODB_FORCE_NULL_AND_ZERO:
switch ($type)
{
@@ -919,7 +912,7 @@ static $cacheCols;
break;
}
break;
-
+
} // switch
/*********************************************************/