Skip to content

[stable23] Avoid calling image* methods on boolean #30115

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

Merged
come-nc merged 3 commits into from
Dec 6, 2021
Merged

[stable23] Avoid calling image* methods on boolean #30115

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11b51dd
Avoid calling image* methods on boolean
come-nc Dec 2, 2021
3fe20bf
Fix typing problems in OC_Image
come-nc Dec 2, 2021
f889b25
Avoid assignment in if clause
come-nc Dec 2, 2021
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
Prev Previous commit
Avoid assignment in if clause 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @backportbot
come-nc authored and backportbot[bot] committed Dec 6, 2021
commit f889b251b1f4d7542cf628c5502548a6620f93d9
20 changes: 12 additions & 8 deletions lib/private/legacy/OC_Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,13 @@ public function mimeType() {
* @return int
*/
public function width() {
if ($this->valid() && (($width = imagesx($this->resource)) !== false)) {
return $width;
} else {
return -1;
if ($this->valid()) {
$width = imagesx($this->resource);
if ($width !== false) {
return $width;
}
}
return -1;
}

/**
Expand All @@ -137,11 +139,13 @@ public function width() {
* @return int
*/
public function height() {
if ($this->valid() && (($height = imagesy($this->resource)) !== false)) {
return $height;
} else {
return -1;
if ($this->valid()) {
$height = imagesy($this->resource);
if ($height !== false) {
return $height;
}
}
return -1;
}

/**
Expand Down