Skip to content

Subtle improvements in the code for PHP 5.3+ ;-) #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Subtle improvements in the code for PHP 5.3+ ;-) #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1da6bb
Merge pull request #1 from josegonzalez/master
EOM Nov 26, 2015
f5b7f84
Update ShellUploadBehavior.php
EOM Nov 26, 2015
304127b
Update UploadBehavior.php
EOM Nov 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Model/Behavior/ShellUploadBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ShellUploadBehavior extends UploadBehavior {
* @param array $options The options array
* @return string
*/
public function path(Model $model, $field, $options = []) {
public function path(Model $model, $field, $options = array()) {
return parent::_path($model, $field, $options);
}

Expand All @@ -33,4 +33,4 @@ public function path(Model $model, $field, $options = []) {
public function createThumbnails(Model $model, $field, $path, $thumbnailPath) {
return parent::_createThumbnails($model, $field, $path, $thumbnailPath);
}
}
}
6 changes: 3 additions & 3 deletions Model/Behavior/UploadBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,7 @@ protected function _resizePhp(Model $model, $field, $path, $size, $geometry, $th
$outputHandler = 'imagepng';
$supportsQuality = true;
// convert 0 (lowest) - 100 (highest) thumbnailQuality, to 0 (highest) - 9 (lowest) quality (see http://php.net/manual/en/function.imagepng.php)
$adjustedQuality = intval((100 - $this->settings[$model->alias][$field]['thumbnailQuality']) / 100 * 9);
$adjustedQuality = (int)((100 - $this->settings[$model->alias][$field]['thumbnailQuality']) / 100 * 9);
break;
default:
return false;
Expand Down Expand Up @@ -1508,12 +1508,12 @@ protected function _createImageResource($filename, $pathInfo) {
*/
protected function _imagecreatefromjpegexif($filename) {
$image = imagecreatefromjpeg($filename);
$exif = false;
$exif = array();
if (function_exists('exif_read_data')) {
$exif = exif_read_data($filename);
}

if ($image && $exif && isset($exif['Orientation'])) {
if ($image && isset($exif['Orientation']) === true) {
$ort = $exif['Orientation'];
} else {
return $image;
Expand Down