From b30dd0d98cafc0502b3bfeff14d533334586c805 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Fri, 18 Feb 2011 22:59:01 +0000 Subject: [PATCH] Fixup assignment in loop comment out undefined variable used in function call --- includes/db/DatabaseMssql.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php index 843cd5e414..c9fd1e4b60 100644 --- a/includes/db/DatabaseMssql.php +++ b/includes/db/DatabaseMssql.php @@ -500,7 +500,7 @@ class DatabaseMssql extends DatabaseBase { $ret = parent::insertSelect( $destTable, $srcTable, $varMap, $conds, $fname, $insertOptions, $selectOptions ); if ( $ret === false ) { - throw new DBQueryError( $this, $this->getErrors(), $this->lastErrno(), $sql, $fname ); + throw new DBQueryError( $this, $this->getErrors(), $this->lastErrno(), /*$sql*/ '', $fname ); } elseif ( $ret != NULL ) { // remember number of rows affected $this->mAffectedRows = sqlsrv_rows_affected( $ret ); @@ -1108,7 +1108,10 @@ class MssqlResult { $this->mRows = array(); $this->mNumFields = sqlsrv_num_fields( $queryresult ); $this->mFieldMeta = sqlsrv_field_metadata( $queryresult ); - while ( $row = sqlsrv_fetch_array( $queryresult, SQLSRV_FETCH_ASSOC ) ) { + + $rows = sqlsrv_fetch_array( $queryresult, SQLSRV_FETCH_ASSOC ); + + foreach( $rows as $row ) { if ( $row !== null ) { foreach ( $row as $k => $v ) { if ( is_object( $v ) && method_exists( $v, 'format' ) ) {// DateTime Object -- 2.20.1