Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/109914
Change subject: Avoid variable naming conflicts in DatabasePostgres::selectSQLText ...................................................................... Avoid variable naming conflicts in DatabasePostgres::selectSQLText Spotted by gebhkla on bug 60531 Bug: 60531 Change-Id: Iaf100ea0db05b142549bd98da108e48eae8b9101 --- M includes/db/DatabasePostgres.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/14/109914/1 diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index 8f93d50..6475c8f 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -833,9 +833,9 @@ 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; } } } -- To view, visit https://gerrit.wikimedia.org/r/109914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf100ea0db05b142549bd98da108e48eae8b9101 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender <umherirrender_de...@web.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits