Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
df54621e
Commit
df54621e
authored
Mar 13, 2014
by
Antonio Ramirez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #2740
parent
cd8e6260
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
CaptchaAction.php
framework/captcha/CaptchaAction.php
+2
-3
No files found.
framework/CHANGELOG.md
View file @
df54621e
...
@@ -55,6 +55,7 @@ Yii Framework 2 Change Log
...
@@ -55,6 +55,7 @@ Yii Framework 2 Change Log
-
Bug #2653: Fixed the bug that unsetting an unpopulated AR relation would trigger exception (qiangxue)
-
Bug #2653: Fixed the bug that unsetting an unpopulated AR relation would trigger exception (qiangxue)
-
Bug #2681: Fixed the bug of php build-in server https://bugs.php.net/bug.php?id=66606 (dizews)
-
Bug #2681: Fixed the bug of php build-in server https://bugs.php.net/bug.php?id=66606 (dizews)
-
Bug #2695: Fixed the issue that
`FileValidator::isEmpty()`
always returns true for validate multiple files (ZhandosKz)
-
Bug #2695: Fixed the issue that
`FileValidator::isEmpty()`
always returns true for validate multiple files (ZhandosKz)
-
Bug #2740: Fixed the issue that
`CaptchaAction::run()`
was using obsolete
`Controller::createUrl()`
method (tonydspaniard)
-
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)
-
Bug: Fixed incorrect event name for
`yii\jui\Spinner`
(samdark)
-
Bug: Fixed incorrect event name for
`yii\jui\Spinner`
(samdark)
-
Bug: Json::encode() did not handle objects that implement JsonSerializable interface correctly (cebe)
-
Bug: Json::encode() did not handle objects that implement JsonSerializable interface correctly (cebe)
...
...
framework/captcha/CaptchaAction.php
View file @
df54621e
...
@@ -10,6 +10,7 @@ namespace yii\captcha;
...
@@ -10,6 +10,7 @@ namespace yii\captcha;
use
Yii
;
use
Yii
;
use
yii\base\Action
;
use
yii\base\Action
;
use
yii\base\InvalidConfigException
;
use
yii\base\InvalidConfigException
;
use
yii\helpers\Url
;
/**
/**
* CaptchaAction renders a CAPTCHA image.
* CaptchaAction renders a CAPTCHA image.
...
@@ -117,14 +118,12 @@ class CaptchaAction extends Action
...
@@ -117,14 +118,12 @@ class CaptchaAction extends Action
if
(
Yii
::
$app
->
request
->
getQueryParam
(
self
::
REFRESH_GET_VAR
)
!==
null
)
{
if
(
Yii
::
$app
->
request
->
getQueryParam
(
self
::
REFRESH_GET_VAR
)
!==
null
)
{
// AJAX request for regenerating code
// AJAX request for regenerating code
$code
=
$this
->
getVerifyCode
(
true
);
$code
=
$this
->
getVerifyCode
(
true
);
/** @var \yii\web\Controller $controller */
$controller
=
$this
->
controller
;
return
json_encode
([
return
json_encode
([
'hash1'
=>
$this
->
generateValidationHash
(
$code
),
'hash1'
=>
$this
->
generateValidationHash
(
$code
),
'hash2'
=>
$this
->
generateValidationHash
(
strtolower
(
$code
)),
'hash2'
=>
$this
->
generateValidationHash
(
strtolower
(
$code
)),
// we add a random 'v' parameter so that FireFox can refresh the image
// we add a random 'v' parameter so that FireFox can refresh the image
// when src attribute of image tag is changed
// when src attribute of image tag is changed
'url'
=>
$controller
->
createUrl
([
$this
->
id
,
'v'
=>
uniqid
()]),
'url'
=>
Url
::
to
([
$this
->
id
,
'v'
=>
uniqid
()]),
]);
]);
}
else
{
}
else
{
$this
->
setHttpHeaders
();
$this
->
setHttpHeaders
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment