From ef6f3ebe8ccc836401fa0e4ec4eb8d9eeb410b38 Mon Sep 17 00:00:00 2001
From: Monica Kozbial <kozbial@google.com>
Date: Wed, 30 Sep 2020 15:18:40 -0700
Subject: [PATCH] Clean up some text generator logic (#4342)

---
 generators/javascript/text.js | 2 --
 generators/php/text.js        | 6 ++----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/generators/javascript/text.js b/generators/javascript/text.js
index eeeb200e3..8f669d7cc 100644
--- a/generators/javascript/text.js
+++ b/generators/javascript/text.js
@@ -188,8 +188,6 @@ Blockly.JavaScript['text_getSubstring'] = function(block) {
   var text = Blockly.JavaScript.valueToCode(block, 'STRING',
       textOrder) || '\'\'';
   if (where1 == 'FIRST' && where2 == 'LAST') {
-    var text = Blockly.JavaScript.valueToCode(block, 'STRING',
-        Blockly.JavaScript.ORDER_NONE) || '\'\'';
     var code = text;
     return [code, Blockly.JavaScript.ORDER_NONE];
   } else if (text.match(/^'?\w+'?$/) || requiresLengthCall) {
diff --git a/generators/php/text.js b/generators/php/text.js
index a9c26d208..b598f7a13 100644
--- a/generators/php/text.js
+++ b/generators/php/text.js
@@ -153,14 +153,12 @@ Blockly.PHP['text_getSubstring'] = function(block) {
   // Get substring.
   var where1 = block.getFieldValue('WHERE1');
   var where2 = block.getFieldValue('WHERE2');
+  var text = Blockly.PHP.valueToCode(block, 'STRING',
+      Blockly.PHP.ORDER_NONE) || '\'\'';
   if (where1 == 'FIRST' && where2 == 'LAST') {
-    var text = Blockly.PHP.valueToCode(block, 'STRING',
-        Blockly.PHP.ORDER_NONE) || '\'\'';
     var code = text;
     return [code, Blockly.PHP.ORDER_NONE];
   } else {
-    var text = Blockly.PHP.valueToCode(block, 'STRING',
-        Blockly.PHP.ORDER_NONE) || '\'\'';
     var at1 = Blockly.PHP.getAdjusted(block, 'AT1');
     var at2 = Blockly.PHP.getAdjusted(block, 'AT2');
     var functionName = Blockly.PHP.provideFunction_(