Skip to content

[stable22] Fix path of file_get_contents #29073

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
kesselb merged 2 commits into from
Oct 4, 2021
Merged

[stable22] Fix path of file_get_contents #29073

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0506288
Fix path of `file_get_contents`
solracsf Aug 17, 2021
99c053e
Avoid usage of Nextcloud API, use PHP function
solracsf Aug 18, 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
Next Next commit
Fix path of file_get_contents 
Try to fix #28370  and #27441 

Avoid pre-pends the `$path` to the user's own storage.
  • Loading branch information
@solracsf @backportbot
solracsf authored and backportbot[bot] committed Oct 4, 2021
commit 0506288882843ea1f09bf2d0e4cc12bc7cc29f21
2 changes: 1 addition & 1 deletion lib/private/legacy/OC_Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ public function loadFromFile($imagePath = false) {
default:

// this is mostly file created from encrypted file
$this->resource = imagecreatefromstring(\OC\Files\Filesystem::file_get_contents(\OC\Files\Filesystem::getLocalPath($imagePath)));
$this->resource = imagecreatefromstring(file_get_contents(\OC\Files\Filesystem::getLocalPath($imagePath)));
$iType = IMAGETYPE_PNG;
$this->logger->debug('OC_Image->loadFromFile, Default', ['app' => 'core']);
break;
Expand Down