Skip to content
This repository
Browse code

Merge branch 'hotfix/3025' into develop

Forward port #3025
  • Loading branch information...
commit 10ad838bb4cfd688765ea163a51ed7a6efd4cb02 2 parents 8347c5e + dcbdd69
Matthew Weier O'Phinney weierophinney authored
3  library/Zend/Form/View/Helper/Captcha/AbstractWord.php
@@ -130,9 +130,8 @@ protected function renderCaptchaInputs(ElementInterface $element)
130 130
131 131 $hidden = $this->renderCaptchaHidden($captcha, $attributes);
132 132 $input = $this->renderCaptchaInput($captcha, $attributes);
133   - $separator = $this->getSeparator();
134 133
135   - return $hidden . $separator . $input;
  134 + return $hidden . $input;
136 135 }
137 136
138 137 /**
9 tests/ZendTest/Form/View/Helper/Captcha/DumbTest.php
@@ -92,4 +92,13 @@ public function testSetSeparator()
92 92
93 93 $this->assertEquals('-', $this->helper->getSeparator());
94 94 }
  95 +
  96 + public function testRenderSeparatorOneTimeAfterText()
  97 + {
  98 + $element = $this->getElement();
  99 + $this->helper->setSeparator('<br />');
  100 + $markup = $this->helper->render($element);
  101 + $this->assertContains($this->captcha->getLabel() . ' <b>' . strrev($this->captcha->getWord()) . '</b>' . $this->helper->getSeparator() . '<input name="foo[id]" type="hidden"', $markup);
  102 + $this->assertNotContains($this->helper->getSeparator() . '<input name="foo[input]" type="text"', $markup);
  103 + }
95 104 }

0 comments on commit 10ad838

Please sign in to comment.
Something went wrong with that request. Please try again.