From 2759b7b2c15e4ace5912f6e3a0c5b15625988e1e Mon Sep 17 00:00:00 2001
From: ivanmatveev <Redjiks@gmail.com>
Date: Tue, 18 Aug 2015 10:58:12 +0500
Subject: [PATCH] fix after merge

---
 api/app/Http/Controllers/UserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/app/Http/Controllers/UserController.php b/api/app/Http/Controllers/UserController.php
index dd4f9ac4..5f1328be 100644
--- a/api/app/Http/Controllers/UserController.php
+++ b/api/app/Http/Controllers/UserController.php
@@ -255,7 +255,7 @@ public function unlinkSocialLogin($id, $provider)
      */
     public function getOne($id)
     {
-        $this->validateId($id, $this->getKeyName());
+        $this->validateId($id, $this->getModel()->getKeyName());
 
         $user = User::find($id);