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
ba690d54
Commit
ba690d54
authored
Jun 23, 2014
by
Carsten Brandt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Imagick image can not be converted to string on HHVM
made it consistent with the GD function. See also
https://github.com/yiisoft/yii/pull/3406
parent
41cbebf6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
CaptchaAction.php
framework/captcha/CaptchaAction.php
+3
-4
No files found.
framework/CHANGELOG.md
View file @
ba690d54
...
@@ -55,6 +55,7 @@ Yii Framework 2 Change Log
...
@@ -55,6 +55,7 @@ Yii Framework 2 Change Log
-
Bug: Fixed inconsistent return of
`\yii\console\Application::runAction()`
(samdark)
-
Bug: Fixed inconsistent return of
`\yii\console\Application::runAction()`
(samdark)
-
Bug: URL encoding for the route parameter added to
`\yii\web\UrlManager`
(klimov-paul)
-
Bug: URL encoding for the route parameter added to
`\yii\web\UrlManager`
(klimov-paul)
-
Bug: Fixed the bug that requesting protected or private action methods would cause 500 error instead of 404 (qiangxue)
-
Bug: Fixed the bug that requesting protected or private action methods would cause 500 error instead of 404 (qiangxue)
-
Bug: Fixed Object of class Imagick could not be converted to string in CaptchaAction (eXprojects, cebe)
-
Enh #2264:
`CookieCollection::has()`
will return false for expired or removed cookies (qiangxue)
-
Enh #2264:
`CookieCollection::has()`
will return false for expired or removed cookies (qiangxue)
-
Enh #2435:
`yii\db\IntegrityException`
is now thrown on database integrity errors instead of general
`yii\db\Exception`
(samdark)
-
Enh #2435:
`yii\db\IntegrityException`
is now thrown on database integrity errors instead of general
`yii\db\Exception`
(samdark)
-
Enh #2837: Error page now shows arguments in stack trace method calls (samdark)
-
Enh #2837: Error page now shows arguments in stack trace method calls (samdark)
...
...
framework/captcha/CaptchaAction.php
View file @
ba690d54
...
@@ -247,7 +247,7 @@ class CaptchaAction extends Action
...
@@ -247,7 +247,7 @@ class CaptchaAction extends Action
/**
/**
* Renders the CAPTCHA image based on the code using GD library.
* Renders the CAPTCHA image based on the code using GD library.
* @param string $code the verification code
* @param string $code the verification code
* @return string image contents
* @return string image contents
in PNG format.
*/
*/
protected
function
renderImageByGD
(
$code
)
protected
function
renderImageByGD
(
$code
)
{
{
...
@@ -300,7 +300,7 @@ class CaptchaAction extends Action
...
@@ -300,7 +300,7 @@ class CaptchaAction extends Action
/**
/**
* Renders the CAPTCHA image based on the code using ImageMagick library.
* Renders the CAPTCHA image based on the code using ImageMagick library.
* @param string $code the verification code
* @param string $code the verification code
* @return
\Imagick image instance. Can be used as string. In this case it will contain image contents
.
* @return
string image contents in PNG format
.
*/
*/
protected
function
renderImageByImagick
(
$code
)
protected
function
renderImageByImagick
(
$code
)
{
{
...
@@ -332,8 +332,7 @@ class CaptchaAction extends Action
...
@@ -332,8 +332,7 @@ class CaptchaAction extends Action
}
}
$image
->
setImageFormat
(
'png'
);
$image
->
setImageFormat
(
'png'
);
return
$image
->
getImageBlob
();
return
$image
;
}
}
/**
/**
...
...
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