From 435cc44f914486666a2bd25bf2a2d996d237ac9c Mon Sep 17 00:00:00 2001
From: Gregwar <g.passault@gmail.com>
Date: Fri, 4 Jan 2013 08:31:59 +0100
Subject: [PATCH] Renaming view variable to image_id to avoid collision with
 the field id (see #43)

---
 Resources/views/captcha.html.twig | 8 ++++----
 Type/CaptchaType.php              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/views/captcha.html.twig b/Resources/views/captcha.html.twig
index 7871dae..6342936 100644
--- a/Resources/views/captcha.html.twig
+++ b/Resources/views/captcha.html.twig
@@ -3,15 +3,15 @@
 -
 {% else %}
 {% spaceless %}
-    <img id="{{ id }}" src="{{ captcha_code }}" alt="" title="captcha" width="{{ captcha_width }}" height="{{ captcha_height }}" />
+    <img id="{{ image_id }}" src="{{ captcha_code }}" alt="" title="captcha" width="{{ captcha_width }}" height="{{ captcha_height }}" />
     {% if reload %}
     <script type="text/javascript">
-        function reload_{{ id }}() {
-            var img = document.getElementById('{{ id }}');
+        function reload_{{ image_id }}() {
+            var img = document.getElementById('{{ image_id }}');
             img.src = '{{ captcha_code }}?n=' + (new Date()).getTime();
         }
     </script>
-    <a class="captcha_reload" href="javascript:reload_{{ id }}();">{{ 'Renew'|trans({}, 'gregwar_captcha') }}</a>
+    <a class="captcha_reload" href="javascript:reload_{{ image_id }}();">{{ 'Renew'|trans({}, 'gregwar_captcha') }}</a>
     {% endif %}
     {{ form_widget(form) }}
 {% endspaceless %}
diff --git a/Type/CaptchaType.php b/Type/CaptchaType.php
index 101b62a..4c99549 100644
--- a/Type/CaptchaType.php
+++ b/Type/CaptchaType.php
@@ -93,7 +93,7 @@ class CaptchaType extends AbstractType
             'captcha_width'     => $options['width'],
             'captcha_height'    => $options['height'],
             'reload'            => $options['reload'],
-            'id'                => uniqid('captcha_'),
+            'image_id'                => uniqid('captcha_'),
             'captcha_code'      => $this->generator->getCaptchaCode($this->key, $options),
             'value'             => '',
             'is_human'          => $isHuman