ZF-5937: applying patch to disableTranslator issue, provided by Mike Willbanks

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16136 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Form/Element/Multi.php

@@ -278,7 +278,7 @@ abstract class Zend_Form_Element_Multi extends Zend_Form_Element_Xhtml
     protected function _translateOption($option, $value)
     {
         if ($this->translatorIsDisabled()) {
-            return true;
+            return false;
         }
 
         if (!isset($this->_translated[$option]) && !empty($value)) {

tests/Zend/Form/Element/MultiselectTest.php

@@ -290,6 +290,20 @@ class Zend_Form_Element_MultiselectTest extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * @group ZF-5937
+     */
+    public function testAddMultiOptionShouldWorkAfterTranslatorIsDisabled()
+    {
+        $options = array(
+            'foovalue' => 'Foo',
+        );
+        $this->element->setDisableTranslator(true)
+                      ->addMultiOptions($options);
+        $test = $this->element->getMultiOption('foovalue');
+        $this->assertEquals($options['foovalue'], $test);
+    }
+
+    /**
      * Used by test methods susceptible to ZF-2794, marks a test as incomplete
      *
      * @link   http://framework.zend.com/issues/browse/ZF-2794