Merge branch 'hotfix/4729'

Close #4729
zendframework · Jun 26, 2013 · 02cf68e · 02cf68e
2 parents 150fdc3 + 8e326c4
commit 02cf68e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/library/Zend/Captcha/ReCaptcha.php b/library/Zend/Captcha/ReCaptcha.php
@@ -126,6 +126,12 @@ public function __construct($options = null)
         parent::__construct($options);
 
         if (!empty($options)) {
+            if (array_key_exists('private_key', $options)) {
+                $this->getService()->setPrivateKey($options['private_key']);
+            }
+            if (array_key_exists('public_key', $options)) {
+                $this->getService()->setPublicKey($options['public_key']);
+            }
             $this->setOptions($options);
         }
     }

diff --git a/tests/ZendTest/Captcha/ReCaptchaTest.php b/tests/ZendTest/Captcha/ReCaptchaTest.php
@@ -88,6 +88,19 @@ public function testSetAndGetPublicAndPrivateKeys()
         $this->assertSame($privKey, $captcha->getService()->getPrivateKey());
     }
 
+    public function testSetAndGetRecaptchaServicePublicAndPrivateKeysFromOptions()
+    {
+        $publicKey = 'publicKey';
+        $privateKey = 'privateKey';
+        $options = array(
+            'public_key' => $publicKey,
+            'private_key' => $privateKey
+        );
+        $captcha = new ReCaptcha($options);
+        $this->assertSame($publicKey, $captcha->getService()->getPublicKey());
+        $this->assertSame($privateKey, $captcha->getService()->getPrivateKey());
+    }
+
     /** @group ZF-7654 */
     public function testConstructorShouldAllowSettingLangOptionOnServiceObject()
     {