From 9e3e5897bdb46ca926f6a75606e257ed6979f23e Mon Sep 17 00:00:00 2001
From: Tom Adam <tomadam@instantiate.co.uk>
Date: Tue, 14 Aug 2012 22:55:18 +0100
Subject: [PATCH] Alter upgrade notes with changes to _form_is_choice_selected
 twig function

---
 UPGRADE-2.1.md | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md
index c5b920402adf..58c50dd710a4 100644
--- a/UPGRADE-2.1.md
+++ b/UPGRADE-2.1.md
@@ -530,11 +530,9 @@
     by default. Take care if your JavaScript relies on that. If you want to
     read the actual choice value, read the `value` attribute instead.
 
-  * In the choice field type's template, the structure of the `choices` variable
-    has changed.
-
-    The `choices` variable now contains `ChoiceView` objects with two getters,
-    `getValue()` and `getLabel()`, to access the choice data.
+  * In the choice field type's template, the `_form_is_choice_selected` method
+    used to identify a selected choice has been replaced with the `selectedchoice`
+    filter.
 
     Before:
 
@@ -549,9 +547,9 @@
     After:
 
     ```
-    {% for choice in choices %}
-        <option value="{{ choice.value }}"{% if _form_is_choice_selected(form, choice) %} selected="selected"{% endif %}>
-            {{ choice.label }}
+    {% for choice, label in choices %}
+        <option value="{{ choice }}"{% if choice is selectedchoice(form) %} selected="selected"{% endif %}>
+            {{ label }}
         </option>
     {% endfor %}
     ```