aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-12-07 11:08:41 +0100
committerMario <mario@mariovavti.com>2020-12-07 11:08:41 +0100
commitb1f001442973352e66c43beea70891ca52de4b5f (patch)
tree4a852420644abe35d2758951e305d0adeecb3867
parent21ac4b513996df80a12e249b29eca0bee40e47cc (diff)
parentd984918c75f4721975a0db55d8d05cf424b55e16 (diff)
downloadvolse-hubzilla-b1f001442973352e66c43beea70891ca52de4b5f.tar.gz
volse-hubzilla-b1f001442973352e66c43beea70891ca52de4b5f.tar.bz2
volse-hubzilla-b1f001442973352e66c43beea70891ca52de4b5f.zip
Merge branch 'dev' into 'dev'
Skip profile photo query from addons for undefined channel id See merge request hubzilla/core!1884
-rw-r--r--Zotlabs/Module/Photo.php22
1 files changed, 11 insertions, 11 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index c88696578..01edda9ae 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -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) {