From 611da2ffbd1f8fd24a11ac9b152efb7a620a4ee7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 15 Sep 2015 02:59:19 -0700
Subject: [PATCH] Only show location map if $user->userloc is valid

---
 app/config/version.php                 | 4 ++--
 app/views/backend/users/view.blade.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index f13ade28e8..4b34529634 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-112',
-  'hash_version' => 'v2.0-112-gdac2747',
+  'app_version' => 'v2.0-114',
+  'hash_version' => 'v2.0-114-g06c9076',
 );
\ No newline at end of file
diff --git a/app/views/backend/users/view.blade.php b/app/views/backend/users/view.blade.php
index deb46a4c60..71c8139a65 100755
--- a/app/views/backend/users/view.blade.php
+++ b/app/views/backend/users/view.blade.php
@@ -410,7 +410,7 @@
 
                         <h6> @lang('admin/users/general.contact_user', array('name' => $user->first_name)) </h6>
 
-                        @if ($user->location_id)
+                        @if ($user->userloc)
 	                        <div class="col-md-12">
 	                            <iframe width="300" height="133" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://maps.google.com/maps?&amp;q={{{ $user->userloc->address }}},{{{ $user->userloc->city }}},{{{ strtoupper($user->userloc->state) }}},{{{ strtoupper($user->userloc->country) }}}&amp;output=embed" style="float: none;"></iframe>
 	                         </div>