From 440bc1a4b446695dc8613a2f31f024b15fbdfebb Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 21 Oct 2015 23:15:35 -0700
Subject: [PATCH] Fixes bug in people display

---
 app/controllers/admin/UsersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index 2b0668e77b..a509cf35f1 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -909,7 +909,7 @@ class UsersController extends AdminController {
                             .'<a href="mailto:'.$user->email.'" class="hidden-xs hidden-sm"><i class="fa fa-envelope"></i></a>'
                             .'</span>' : '',
                 'username'         => $user->username,
-                'location'      => ($user->location_id!='') ? $user->userloc->name : '',
+                'location'      => ($user->userloc) ? $user->userloc->name : '',
                 'manager'         => ($user->manager) ? '<a title="' . $user->manager->fullName() . '" href="users/' . $user->manager->id . '/view">' . $user->manager->fullName() . '</a>' : '',
                 'assets'        => $user->assets->count(),
                 'licenses'        => $user->licenses->count(),