fixed #88
This commit is contained in:
		@@ -84,13 +84,15 @@ class User extends Authenticatable
 | 
				
			|||||||
    {
 | 
					    {
 | 
				
			||||||
        // Check if we should use gravatar
 | 
					        // Check if we should use gravatar
 | 
				
			||||||
        if (setting('general.use_gravatar', '0') == '1') {
 | 
					        if (setting('general.use_gravatar', '0') == '1') {
 | 
				
			||||||
            // Check for gravatar
 | 
					 | 
				
			||||||
            $url = 'https://www.gravatar.com/avatar/' . md5(strtolower($this->getAttribute('email'))).'?size=90&d=404';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            $client = new \GuzzleHttp\Client(['verify' => false]);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            try {
 | 
					            try {
 | 
				
			||||||
                $value = $client->request('GET', $url)->getBody()->getContents();
 | 
					                // Check for gravatar
 | 
				
			||||||
 | 
					                $url = 'https://www.gravatar.com/avatar/' . md5(strtolower($this->getAttribute('email'))).'?size=90&d=404';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                $client = new \GuzzleHttp\Client(['verify' => false]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                $client->request('GET', $url)->getBody()->getContents();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                $value = $url;
 | 
				
			||||||
            } catch (RequestException $e) {
 | 
					            } catch (RequestException $e) {
 | 
				
			||||||
                // 404 Not Found
 | 
					                // 404 Not Found
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -156,7 +156,11 @@
 | 
				
			|||||||
                <li class="dropdown user user-menu">
 | 
					                <li class="dropdown user user-menu">
 | 
				
			||||||
                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
 | 
					                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
 | 
				
			||||||
                        @if ($user->picture)
 | 
					                        @if ($user->picture)
 | 
				
			||||||
                            <img src="{{ Storage::url($user->picture) }}" class="user-image" alt="User Image">
 | 
					                            @if (setting('general.use_gravatar', '0') == '1')
 | 
				
			||||||
 | 
					                                <img src="{{ $user->picture }}" class="user-image" alt="User Image">
 | 
				
			||||||
 | 
					                            @else
 | 
				
			||||||
 | 
					                                <img src="{{ Storage::url($user->picture) }}" class="user-image" alt="User Image">
 | 
				
			||||||
 | 
					                            @endif
 | 
				
			||||||
                        @else
 | 
					                        @else
 | 
				
			||||||
                            <i class="fa fa-user-o"></i>
 | 
					                            <i class="fa fa-user-o"></i>
 | 
				
			||||||
                        @endif
 | 
					                        @endif
 | 
				
			||||||
@@ -168,7 +172,11 @@
 | 
				
			|||||||
                        <!-- User image -->
 | 
					                        <!-- User image -->
 | 
				
			||||||
                        <li class="user-header">
 | 
					                        <li class="user-header">
 | 
				
			||||||
                            @if ($user->picture)
 | 
					                            @if ($user->picture)
 | 
				
			||||||
                            <img src="{{ Storage::url($user->picture) }}" class="img-circle" alt="User Image">
 | 
					                                @if (setting('general.use_gravatar', '0') == '1')
 | 
				
			||||||
 | 
					                                    <img src="{{ $user->picture }}" class="img-circle" alt="User Image">
 | 
				
			||||||
 | 
					                                @else
 | 
				
			||||||
 | 
					                                    <img src="{{ Storage::url($user->picture) }}" class="img-circle" alt="User Image">
 | 
				
			||||||
 | 
					                                @endif
 | 
				
			||||||
                            @else
 | 
					                            @else
 | 
				
			||||||
                                <i class="fa fa-4 fa-user-o" style="color: #fff; font-size: 7em;"></i>
 | 
					                                <i class="fa fa-4 fa-user-o" style="color: #fff; font-size: 7em;"></i>
 | 
				
			||||||
                            @endif
 | 
					                            @endif
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user