Merge pull request #15240 from demeritcowboy/avoid-variable-name-conflict
authorEileen McNaughton <emcnaughton@wikimedia.org>
Sat, 7 Sep 2019 21:06:05 +0000 (09:06 +1200)
committerGitHub <noreply@github.com>
Sat, 7 Sep 2019 21:06:05 +0000 (09:06 +1200)
commitdc5fb9aecf1400ce28edcdfd43edee7706e2e7da
treec8a6994136b7f152253b8a63b5d78fe5b7da53a4
parenta2106c80ca245870847f7adb6e7d3dc079b9616e
parentf692bf3329f329ef652607467f5f978646cae541
Merge pull request #15240 from demeritcowboy/avoid-variable-name-conflict

dev/core#1123 - avoid possible variable name clash