From 693bdbb10e5237efc5a45501e6c18d2277ddd982 Mon Sep 17 00:00:00 2001
From: marisaleung <marisaleung@google.com>
Date: Mon, 26 Jun 2017 11:51:32 -0700
Subject: [PATCH] Fix python and php procedures.

---
 generators/php.js               | 6 ++++--
 generators/php/procedures.js    | 4 +++-
 generators/python/procedures.js | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/generators/php.js b/generators/php.js
index 3a54d7d4a..2c65a6809 100644
--- a/generators/php.js
+++ b/generators/php.js
@@ -150,9 +150,11 @@ Blockly.PHP.init = function(workspace) {
   }
 
   var defvars = [];
+  var varName;
   var variables = Blockly.Variables.allVariables(workspace);
-  for (var i = 0; i < variables.length; i++) {
-    defvars[i] = Blockly.PHP.variableDB_.getName(variables[i],
+  for (var i = 0, variable; variable = variables[i]; i++) {
+    varName = variable.name;
+    defvars[i] = Blockly.PHP.variableDB_.getName(varName,
         Blockly.Variables.NAME_TYPE) + ';';
   }
   Blockly.PHP.definitions_['variables'] = defvars.join('\n');
diff --git a/generators/php/procedures.js b/generators/php/procedures.js
index 15ba85d76..791015a02 100644
--- a/generators/php/procedures.js
+++ b/generators/php/procedures.js
@@ -33,8 +33,10 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
   // First, add a 'global' statement for every variable that is not shadowed by
   // a local parameter.
   var globals = [];
+  var varName;
   var variables = workspace.getAllVariables();
-  for (var i = 0, varName; varName = variables[i].name; i++) {
+  for (var i = 0, variable; variable = variables[i]; i++) {
+    varName = variable.name;
     if (block.arguments_.indexOf(varName) == -1) {
       globals.push(Blockly.PHP.variableDB_.getName(varName,
           Blockly.Variables.NAME_TYPE));
diff --git a/generators/python/procedures.js b/generators/python/procedures.js
index 94804fd47..311ebefec 100644
--- a/generators/python/procedures.js
+++ b/generators/python/procedures.js
@@ -34,8 +34,10 @@ Blockly.Python['procedures_defreturn'] = function(block) {
   // First, add a 'global' statement for every variable that is not shadowed by
   // a local parameter.
   var globals = [];
+  var varName;
   var variables = workspace.getAllVariables();
-  for (var i = 0, varName; varName = variables[i]; i++) {
+  for (var i = 0, variable; variable = variables[i]; i++) {
+    varName = variable.name;
     if (block.arguments_.indexOf(varName) == -1) {
       globals.push(Blockly.Python.variableDB_.getName(varName,
           Blockly.Variables.NAME_TYPE));