aboutsummaryrefslogtreecommitdiffstats
path: root/mod/photo.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-12-18 18:21:47 +0000
committerThomas Willingham <founder@kakste.com>2013-12-18 18:21:47 +0000
commit7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch)
tree03b41e86e0790895fe56488beea2b5f554fbaeae /mod/photo.php
parent733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff)
parentdf34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff)
downloadvolse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz
volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2
volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: mod/page.php
Diffstat (limited to 'mod/photo.php')
-rw-r--r--mod/photo.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/mod/photo.php b/mod/photo.php
index 3e86b02ba..591d7198a 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -24,7 +24,7 @@ function photo_init(&$a) {
$observer_xchan = get_observer_hash();
- $default = 'images/person-175.jpg';
+ $default = 'images/default_profile_photos/rainbow_man/175.jpg';
if(isset($type)) {
@@ -38,11 +38,11 @@ function photo_init(&$a) {
case 'm':
$resolution = 5;
- $default = 'images/person-80.jpg';
+ $default = 'images/default_profile_photos/rainbow_man/80.jpg';
break;
case 's':
$resolution = 6;
- $default = 'images/person-48.jpg';
+ $default = 'images/default_profile_photos/rainbow_man/48.jpg';
break;
case 'l':
default:
@@ -135,15 +135,15 @@ function photo_init(&$a) {
switch($resolution) {
case 4:
- $data = file_get_contents('images/person-175.jpg');
+ $data = file_get_contents('images/default_profile_photos/rainbow_man/175.jpg');
$mimetype = 'image/jpeg';
break;
case 5:
- $data = file_get_contents('images/person-80.jpg');
+ $data = file_get_contents('images/default_profile_photos/rainbow_man/80.jpg');
$mimetype = 'image/jpeg';
break;
case 6:
- $data = file_get_contents('images/person-48.jpg');
+ $data = file_get_contents('images/default_profile_photos/rainbow_man/48.jpg');
$mimetype = 'image/jpeg';
break;
default: