Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
hubzilla
core
Commits
b1f00144
Commit
b1f00144
authored
Dec 07, 2020
by
Mario
Browse files
Merge branch 'dev' into 'dev'
Skip profile photo query from addons for undefined channel id See merge request
!1884
parents
21ac4b51
d984918c
Pipeline
#370039
passed with stage
in 5 minutes and 58 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Zotlabs/Module/Photo.php
View file @
b1f00144
...
...
@@ -81,18 +81,18 @@ class Photo extends \Zotlabs\Web\Controller {
else
$data
=
dbunescbin
(
$r
[
0
][
'content'
]);
}
}
if
(
!
$data
)
{
$d
=
[
'imgscale'
=>
$resolution
,
'channel_id'
=>
$uid
,
'default'
=>
$default
,
'data'
=>
''
,
'mimetype'
=>
''
];
call_hooks
(
'get_profile_photo'
,
$d
);
$resolution
=
$d
[
'imgscale'
];
$uid
=
$d
[
'channel_id'
];
$default
=
$d
[
'default'
];
$data
=
$d
[
'data'
];
$mimetype
=
$d
[
'mimetype'
];
$modified
=
0
;
if
(
!
$data
)
{
$d
=
[
'imgscale'
=>
$resolution
,
'channel_id'
=>
$uid
,
'default'
=>
$default
,
'data'
=>
''
,
'mimetype'
=>
''
];
call_hooks
(
'get_profile_photo'
,
$d
);
$resolution
=
$d
[
'imgscale'
];
$uid
=
$d
[
'channel_id'
];
$default
=
$d
[
'default'
];
$data
=
$d
[
'data'
];
$mimetype
=
$d
[
'mimetype'
];
$modified
=
0
;
}
}
if
(
!
$data
)
{
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment