From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 18 Feb 2011 22:59:01 +0000 (+0000)
Subject: Fixup assignment in loop
X-Git-Tag: 1.31.0-rc.0~31916
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=b30dd0d98cafc0502b3bfeff14d533334586c805;p=lhc%2Fweb%2Fwiklou.git

Fixup assignment in loop

comment out undefined variable used in function call
---

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