From: umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 28 Jan 2014 16:52:57 +0000 (+0100)
Subject: Avoid variable naming conflicts in DatabasePostgres::selectSQLText
X-Git-Tag: 1.31.0-rc.0~17116^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=8f8540a6d9c3af4eb011102cb2b9a70eb192d867;p=lhc%2Fweb%2Fwiklou.git

Avoid variable naming conflicts in DatabasePostgres::selectSQLText

Spotted by gebhkla on bug 60531

Bug: 60531
Change-Id: Iaf100ea0db05b142549bd98da108e48eae8b9101
---

diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 8f93d50280..6475c8fee4 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -833,9 +833,9 @@ __INDEXATTR__;
 			if ( $forUpdateKey !== false && $join_conds ) {
 				unset( $options[$forUpdateKey] );
 
-				foreach ( $join_conds as $table => $join_cond ) {
+				foreach ( $join_conds as $table_cond => $join_cond ) {
 					if ( 0 === preg_match( '/^(?:LEFT|RIGHT|FULL)(?: OUTER)? JOIN$/i', $join_cond[0] ) ) {
-						$options['FOR UPDATE'][] = $table;
+						$options['FOR UPDATE'][] = $table_cond;
 					}
 				}
 			}