diff options
| author | Olivier Migeot <olivier@migeot.org> | 2011-10-04 11:45:57 +0200 |
|---|---|---|
| committer | Olivier Migeot <olivier@migeot.org> | 2011-10-04 11:45:57 +0200 |
| commit | 273594af62c960b5a52da5ec1cf6d6bd450415ba (patch) | |
| tree | 5f79914d28c343f7642ecb13b99f9e0e3f5090a7 /mod/profile_photo.php | |
| parent | 1548449586f17c0ef9bfab0ffb16f2a495fc6082 (diff) | |
| parent | dfd5cc57c2134067dc6229b8583b5e808f160004 (diff) | |
| download | volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.gz volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.bz2 volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/profile_photo.php')
| -rw-r--r-- | mod/profile_photo.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 8dc896653..4de3aaa3e 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -155,9 +155,15 @@ function profile_photo_content(&$a) { notice( t('Permission denied.') . EOL ); return; } + $havescale = false; + foreach($r as $rr) { + if($rr['scale'] == 5) + $havescale = true; + } + // set an already uloaded photo as profile photo // if photo is in 'Profile Photos', change it in db - if ($r[0]['album']== t('Profile Photos')){ + if (($r[0]['album']== t('Profile Photos')) && ($havescale)){ $r=q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d", intval(local_user())); |