Merge pull request #2148 from annando/issue-1871

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 6607eebd0c1e1685f8d312b37c3adf7d65278760..4e8d279a972b7ce7ec54b03ee12416a8ec627659 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -79,7 +79,7 @@ function profile_photo_post(&$a) {
                                $im->scaleImage(80);
 
                                $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, $is_default_profile);
-                       
+
                                if($r === false)
                                        notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
 
@@ -97,11 +97,17 @@ function profile_photo_post(&$a) {
                                                dbesc($base_image['resource-id']),
                                                intval(local_user())
                                        );
-                               }
-                               else {
+
+                                       $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s'  WHERE `self` AND `uid` = %d",
+                                               dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
+                                               dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
+                                               dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-6.' . $im->getExt()),
+                                               intval(local_user())
+                                       );
+                               } else {
                                        $r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
-                                               dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4'),
-                                               dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5'),
+                                               dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
+                                               dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
                                                intval($_REQUEST['profile']),
                                                intval(local_user())
                                        );
@@ -118,7 +124,7 @@ function profile_photo_post(&$a) {
                                info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
                                // Update global directory in background
                                $url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
-                               if($url && strlen(get_config('system','directory_submit_url')))
+                               if($url && strlen(get_config('system','directory')))
                                        proc_run('php',"include/directory.php","$url");
 
                                require_once('include/profile_update.php');
@@ -217,7 +223,7 @@ function profile_photo_content(&$a) {
 
                        // Update global directory in background
                        $url = $_SESSION['my_url'];
-                       if($url && strlen(get_config('system','directory_submit_url')))
+                       if($url && strlen(get_config('system','directory')))
                                proc_run('php',"include/directory.php","$url");
 
                        goaway($a->get_baseurl() . '/profiles');