captcha fixes

Model/Behavior/CaptchaBehavior.php

@@ -33,7 +33,7 @@ class CaptchaBehavior extends ModelBehavior {
 		
 		# bootstrap configs
 		$this->settings[$Model->alias] = $defaults;
-		$settings = (array) Configure::read('Captcha');
+		$this->settings[$Model->alias] = array_merge($this->settings[$Model->alias], (array) Configure::read('Captcha'));
 		if (!empty($settings)) {
 			$this->settings[$Model->alias] = array_merge($this->settings[$Model->alias], $settings);
 		}
@@ -55,7 +55,6 @@ class CaptchaBehavior extends ModelBehavior {
 
 	public function beforeValidate(Model $Model) {
 		parent::beforeValidate($Model);
-		
 		if (!empty($this->Model->whitelist)) {
 			$this->Model->whitelist = array_merge($Model->whitelist, $this->fields());
 		}

View/Helper/CaptchaHelper.php

@@ -150,7 +150,11 @@ class CaptchaHelper extends AppHelper {
 	 * 2010-01-08 ms
 	 */
 	public function passive($modelName = null, $options = array()) {
-		return $this->captcha($modelName);
+		$tmp = $this->settings['type'];
+		$this->settings['type'] = 'passive';
+		$res = $this->captcha($modelName);
+		$this->settings['type'] = $tmp;
+		return $res;
 	}
 
 	/**