Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
5ab12a8b
Commit
5ab12a8b
authored
11 years ago
by
Vincent Petry
Browse files
Options
Downloads
Plain Diff
Merge pull request #6445 from owncloud/fix_5956
fix issue with logging non utf8 chars
parents
0d94da7e
6f21da12
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/private/image.php
+2
-2
2 additions, 2 deletions
lib/private/image.php
with
2 additions
and
2 deletions
lib/private/image.php
+
2
−
2
View file @
5ab12a8b
...
@@ -409,14 +409,14 @@ class OC_Image {
...
@@ -409,14 +409,14 @@ class OC_Image {
/**
/**
* @brief Loads an image from a local file.
* @brief Loads an image from a local file.
* @param $image
ref
The path to a local file.
* @param $image
Path
The path to a local file.
* @returns An image resource or false on error
* @returns An image resource or false on error
*/
*/
public
function
loadFromFile
(
$imagePath
=
false
)
{
public
function
loadFromFile
(
$imagePath
=
false
)
{
// exif_imagetype throws "read error!" if file is less than 12 byte
// exif_imagetype throws "read error!" if file is less than 12 byte
if
(
!@
is_file
(
$imagePath
)
||
!
file_exists
(
$imagePath
)
||
filesize
(
$imagePath
)
<
12
||
!
is_readable
(
$imagePath
))
{
if
(
!@
is_file
(
$imagePath
)
||
!
file_exists
(
$imagePath
)
||
filesize
(
$imagePath
)
<
12
||
!
is_readable
(
$imagePath
))
{
// Debug output disabled because this method is tried before loadFromBase64?
// Debug output disabled because this method is tried before loadFromBase64?
OC_Log
::
write
(
'core'
,
'OC_Image->loadFromFile, couldn\'t load: '
.
$imagePath
,
OC_Log
::
DEBUG
);
OC_Log
::
write
(
'core'
,
'OC_Image->loadFromFile, couldn\'t load: '
.
(
string
)
urlencode
(
$imagePath
)
,
OC_Log
::
DEBUG
);
return
false
;
return
false
;
}
}
$iType
=
exif_imagetype
(
$imagePath
);
$iType
=
exif_imagetype
(
$imagePath
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment