From 8202ce45a5ae5dac2c6fdf94bf3554180bbdd7b7 Mon Sep 17 00:00:00 2001
From: Chris Cogdon <chris.cogdon@dtexsystems.com>
Date: Wed, 30 Dec 2015 13:22:58 -0800
Subject: [1.9.x] Fixed #26018 -- Prevented unecessary get_form() call in
 FormMixin.get_context_data().

Changed "dict.setdefault" to "if x in dict" pattern so that get_form() would not
be called unnecessarily, specifically in the case where FormMixin.form_invalid()
calls get_context_data() with the current form.

Backport of e429c5186ceed81c4627165518e0c70c58e69595 from master
---
 docs/releases/1.9.1.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/releases/1.9.1.txt b/docs/releases/1.9.1.txt
index 143db5e596..9af92e30ef 100644
--- a/docs/releases/1.9.1.txt
+++ b/docs/releases/1.9.1.txt
@@ -13,7 +13,7 @@ Bugfixes
   (:ticket:`25840`).
 
 * Fixed a regression in ``FormMixin`` causing forms to be validated twice
-  (:ticket:`25548`).
+  (:ticket:`25548`, :ticket:`26018`).
 
 * Fixed a system check crash with nested ``ArrayField``\s (:ticket:`25867`).
 
-- 
cgit v1.3