diff options
| author | zottel <github@zottel.net> | 2012-03-21 08:08:23 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-21 08:08:23 +0100 |
| commit | 88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e (patch) | |
| tree | dd2eff7d2870ee2c292fd39e69cdaa5a0a9b2fdb /mod/photo.php | |
| parent | cf347664165f97b5262d15464bbb169cbdb4ddd4 (diff) | |
| parent | efd7c14c24aa45878ddc412413ea1593cafcd651 (diff) | |
| download | volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.tar.gz volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.tar.bz2 volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/photo.php')
| -rwxr-xr-x | mod/photo.php | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/mod/photo.php b/mod/photo.php index c4a93769a..3a7025120 100755 --- a/mod/photo.php +++ b/mod/photo.php @@ -23,7 +23,7 @@ function photo_init(&$a) { // NOTREACHED } - $default = 'images/default-profile.jpg'; + $default = 'images/person-175.jpg'; if(isset($type)) { @@ -39,12 +39,12 @@ function photo_init(&$a) { break; case 'micro': $resolution = 6; - $default = 'images/default-profile-mm.jpg'; + $default = 'images/person-48.jpg'; break; case 'avatar': default: $resolution = 5; - $default = 'images/default-profile-sm.jpg'; + $default = 'images/person-80.jpg'; break; } @@ -115,8 +115,24 @@ function photo_init(&$a) { } if(! isset($data)) { - killme(); - // NOTREACHED + if(isset($resolution)) { + switch($resolution) { + + case 4: + $data = file_get_contents('images/person-175.jpg'); + break; + case 5: + $data = file_get_contents('images/person-80.jpg'); + break; + case 6: + $data = file_get_contents('images/person-48.jpg'); + break; + default: + killme(); + // NOTREACHED + break; + } + } } if(isset($customres) && $customres > 0 && $customres < 500) { |