Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / include / Photo.php

diff --git a/include/Photo.php b/include/Photo.php
index 1450374ffc27971fd91b20d325c5593d3ac33413..fce55999961c3f5d377c367eb69ab14a8f40d9f9 100644 (file)
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -87,6 +87,12 @@ class Photo {
 
        }
 
+       public function rotate($degrees) {
+               $this->image  = imagerotate($this->image,$degrees,0);
+               $this->width  = imagesx($this->image);
+               $this->height = imagesy($this->image);
+       }       
+
 
 
        public function scaleImageUp($min) {
@@ -268,9 +274,9 @@ function import_profile_photo($photo,$uid,$cid) {
                $photo_failure = true;
 
        if($photo_failure) {
-               $photo = $a->get_baseurl() . '/images/default-profile.jpg';
-               $thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg';
-               $micro = $a->get_baseurl() . '/images/default-profile-mm.jpg';
+               $photo = $a->get_baseurl() . '/images/person-175.jpg';
+               $thumb = $a->get_baseurl() . '/images/person-80.jpg';
+               $micro = $a->get_baseurl() . '/images/person-48.jpg';
        }
 
        return(array($photo,$thumb,$micro));