php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 14:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed #1992 the issue that use 'site/captcha' will get wrong refreshUrl in module scenario

Browse Source
This commit is contained in:
callmez
2014-01-17 11:32:14 +08:00
parent 579003ab93
commit baad3eb2a8
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/CHANGELOG.md
View File

@ -30,6 +30,8 @@ Yii Framework 2 Change Log
- Bug #1937: Fixed wrong behavior or advanced app's `init --env` when called without parameter actually specified (samdark) - Bug #1937: Fixed wrong behavior or advanced app's `init --env` when called without parameter actually specified (samdark)
- Bug #1959: `Html::activeCheckbox` wasn't respecting custom values for checked/unchecked state (klevron, samdark) - Bug #1959: `Html::activeCheckbox` wasn't respecting custom values for checked/unchecked state (klevron, samdark)
- Bug #1965: `Controller::findLayoutFile()` returns incorrect file path when layout name starts with a slash (qiangxue) - Bug #1965: `Controller::findLayoutFile()` returns incorrect file path when layout name starts with a slash (qiangxue)
- Bug #1992: In module scenario that use 'site/captcha' will get wrong refreshUrl (callmez)
- Bug #1999: `Controller::findLayoutFile()` returns incorrect file path when layout name starts with a slash (qiangxue)
- Bug #1993: afterFind event in AR is now called after relations have been populated (cebe, creocoder) - Bug #1993: afterFind event in AR is now called after relations have been populated (cebe, creocoder)
- Bug #1998: Unchecked required checkbox never pass client validation (klevron) - Bug #1998: Unchecked required checkbox never pass client validation (klevron)
- Bug: Fixed `Call to a member function registerAssetFiles() on a non-object` in case of wrong `sourcePath` for an asset bundle (samdark) - Bug: Fixed `Call to a member function registerAssetFiles() on a non-object` in case of wrong `sourcePath` for an asset bundle (samdark)

2
framework/captcha/Captcha.php
View File

@ -106,7 +106,7 @@ class Captcha extends InputWidget
protected function getClientOptions() protected function getClientOptions()
{ {
$options = [ $options = [
'refreshUrl' => Html::url([$this->captchaAction, CaptchaAction::REFRESH_GET_VAR => 1]), 'refreshUrl' => Html::url(['/' . $this->captchaAction, CaptchaAction::REFRESH_GET_VAR => 1]),
'hashKey' => "yiiCaptcha/{$this->captchaAction}", 'hashKey' => "yiiCaptcha/{$this->captchaAction}",
]; ];
return $options; return $options;

2
framework/captcha/CaptchaValidator.php
View File

@ -68,7 +68,7 @@ class CaptchaValidator extends Validator
*/ */
public function createCaptchaAction() public function createCaptchaAction()
{ {
$ca = Yii::$app->createController(ltrim($this->captchaAction, '/')); $ca = Yii::$app->createController($this->captchaAction);
if ($ca !== false) { if ($ca !== false) {
/** @var \yii\base\Controller $controller */ /** @var \yii\base\Controller $controller */
list($controller, $actionID) = $ca; list($controller, $actionID) = $ca;