diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 21c298a0a0..9908c9cace 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -1340,7 +1340,7 @@ class AssetsController extends AdminController $row = array( 'checkbox' =>'
', 'id' => $asset->id, - 'image' => ($asset->image!='') ? '' : (($asset->model->image!='') ? '' : ''), + 'image' => (($asset->image) && ($asset->image!='')) ? '' : ((($asset->model) && ($asset->model->image!='')) ? '' : ''), 'name' => ''.$asset->name.'', 'asset_tag' => ''.$asset->asset_tag.'', 'serial' => $asset->serial,