send unfollow before removing ostatus contact

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index ba6cffea0b7e50c72aea52d92451aee80f90b688..69c34f8e9c59880153f142e2892f1a5b1fc4b396 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -49,7 +49,7 @@ function register_post(&$a) {
                        $openid->identity = $openid_url;
                        $openid->returnUrl = $a->get_baseurl() . '/openid'; 
                        $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
-                       $openid->optional = array('namePerson/first');
+                       $openid->optional = array('namePerson/first','media/image/aspect11');
                        goaway($openid->authUrl());
                        // NOTREACHED   
                }
@@ -205,9 +205,11 @@ function register_post(&$a) {
 
        }
 
-       require_once('include/Photo.php');
-    $nograv = get_config('system','no_gravatar');
-       if(! $nograv) {
+       $use_gravatar = ((get_config('system','no_gravatar')) ? false : true);
+       if($use_gravatar) {
+
+               require_once('include/Photo.php');
+
                $photo = gravatar_img($email);
                $photo_failure = false;
 
@@ -246,6 +248,7 @@ function register_post(&$a) {
                        }
                }
        }
+
        if( $a->config['register_policy'] == REGISTER_OPEN ) {
                $email_tpl = load_view_file("view/register_open_eml.tpl");
                $email_tpl = replace_macros($email_tpl, array(
@@ -302,7 +305,6 @@ function register_post(&$a) {
                }
 
        }
-       
        return;
 }}