From 8f8540a6d9c3af4eb011102cb2b9a70eb192d867 Mon Sep 17 00:00:00 2001
From: umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 28 Jan 2014 17:52:57 +0100
Subject: [PATCH] Avoid variable naming conflicts in
 DatabasePostgres::selectSQLText

Spotted by gebhkla on bug 60531

Bug: 60531
Change-Id: Iaf100ea0db05b142549bd98da108e48eae8b9101
---
 includes/db/DatabasePostgres.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;
 					}
 				}
 			}
-- 
2.20.1