fix twitter title showing up occasionally

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
old mode 100644 (file)
new mode 100755 (executable)
index b1fd0fc..e3dbdaf
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -86,10 +86,14 @@ function profile_photo_post(&$a) {
                                        intval(local_user())
                                );
 
+                               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')))
                                        proc_run('php',"include/directory.php","$url");
+
+                               require_once('include/profile_update.php');
+                               profile_change();
                        }
                        else
                                notice( t('Unable to process image') . EOL);
@@ -155,9 +159,15 @@ function profile_photo_content(&$a) {
                        notice( t('Permission denied.') . EOL );
                        return;
                }
+               $havescale = false;
+               foreach($r as $rr) {
+                       if($rr['scale'] == 5)
+                               $havescale = true;
+               }
+
                // set an already uloaded photo as profile photo
                // if photo is in 'Profile Photos', change it in db
-               if ($r[0]['album']== t('Profile Photos')){
+               if (($r[0]['album']== t('Profile Photos')) && ($havescale)){
                        $r=q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d",
                                intval(local_user()));
                        
@@ -236,7 +246,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
        $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );   
 
        if($r)
-               notice( t('Image uploaded successfully.') . EOL );
+               info( t('Image uploaded successfully.') . EOL );
        else
                notice( t('Image upload failed.') . EOL );