diff options
| author | zottel <github@zottel.net> | 2012-04-15 14:11:11 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-15 14:11:11 +0200 |
| commit | a2c4ce74871dbe9e640cdeafc1574bda5b7fe144 (patch) | |
| tree | fce1c1b2d497adae72d77e09c6bf005c8900256b /mod/register.php | |
| parent | 0bad8de0562a50fa93b0af5fd4cf8d7123a11b46 (diff) | |
| parent | f299749758112361ee6384cd75d11b2c3a57352a (diff) | |
| download | volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.gz volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.bz2 volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/register.php')
| -rw-r--r-- | mod/register.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mod/register.php b/mod/register.php index 630c0a675..b60707d45 100644 --- a/mod/register.php +++ b/mod/register.php @@ -314,17 +314,13 @@ function register_post(&$a) { } - $use_gravatar = ((get_config('system','no_gravatar')) ? false : true); - - // if we have an openid photo use it. - // otherwise unless it is disabled, use gravatar - - if($use_gravatar || strlen($photo)) { + // if we have no OpenID photo try to look up an avatar + if(! strlen($photo)) + $photo = avatar_img($email); + // unless there is no avatar-plugin loaded + if(strlen($photo)) { require_once('include/Photo.php'); - - if(($use_gravatar) && (! strlen($photo))) - $photo = gravatar_img($email); $photo_failure = false; $filename = basename($photo); @@ -333,7 +329,7 @@ function register_post(&$a) { if($img->is_valid()) { $img->scaleImageSquare(175); - + $hash = photo_new_resource(); $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 ); |