From 3297f207f5892a29da943d542a69ef0b7a724f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=A4rtl?= <haertl.mike@gmail.com>
Date: Thu, 6 Jun 2019 16:08:00 +0200
Subject: [PATCH] Fixes #17341: Fixed error from yii.activeForm.js in strict
 mode

---
 framework/CHANGELOG.md             | 2 +-
 framework/assets/yii.activeForm.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index f097d3468d..8eef17a570 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -4,7 +4,7 @@ Yii Framework 2 Change Log
 2.0.21 under development
 ------------------------
 
-- no changes in this release.
+- Bug #17341: Fixed error from yii.activeForm.js in strict mode (mikehaertl)
 
 
 2.0.20 June 04, 2019
diff --git a/framework/assets/yii.activeForm.js b/framework/assets/yii.activeForm.js
index b86c24c0ff..3b416c0469 100644
--- a/framework/assets/yii.activeForm.js
+++ b/framework/assets/yii.activeForm.js
@@ -706,9 +706,9 @@
         }
 
         if (submitting) {
-            var errorAttributes = [];
-            var $input = findInput($form, this);
+            var errorAttributes = [], $input;
             $.each(data.attributes, function () {
+                $input = findInput($form, this);
                 if (!$input.is(":disabled") && !this.cancelled && updateInput($form, this, messages)) {
                     errorAttributes.push(this);
                 }