jenkins-bot has submitted this change and it was merged.
Change subject: Readd $runningQueuedFunctions
......................................................................
Readd $runningQueuedFunctions
Dropped by Hashar in change 37509, but needed by later changesets
for supporting anonymous functions.
Change-Id: Ie629624dcc4a83eba09211505d41e438ec5ae304
---
M check-vars.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/check-vars.php b/check-vars.php
index d03f6d4..dfe9bc3 100755
--- a/check-vars.php
+++ b/check-vars.php
@@ -378,6 +378,7 @@
function execute() {
global $IP;
$currentToken = null;
+ $runningQueuedFunctions = false;
foreach ( $this->mTokens as $token ) {
if ( self::isMeaningfulToken( $currentToken ) )
@@ -575,7 +576,7 @@
if ( isset(
$this->mFunctionGlobals[ $token[1] ] ) ) {
$this->mFunctionGlobals[ $token[1] ][0] ++;
} elseif (
$this->shouldBeGlobal( $token[1] ) ) {
- if (
$this->mStatus == self::IN_FUNCTION_PARAMETERS ) {
+ if (
$this->mStatus == self::IN_FUNCTION_PARAMETERS && $runningQueuedFunctions ) {
// It will be a global passed in the use clause of the anonymous function
$this->mFunctionGlobals[ $token[1] ] = array( 0, 0, $token[2] );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/48254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie629624dcc4a83eba09211505d41e438ec5ae304
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/code-utils
Gerrit-Branch: master
Gerrit-Owner: Platonides <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
