Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index c4a93769af8d99a0944c5a1186e053a1507137c3..3a702512005789bd187440d8cba585114b565641 100755 (executable)
--- 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) {