From eb25307f23c851014a9129d0fa18657d6820aaac Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Sun, 11 Oct 2015 23:22:36 +0200
Subject: [PATCH] r20151011

Signed-off-by: Flashwave <me@flash.moe>
---
 _sakura/changelog.json      | 11 +++++++++++
 _sakura/components/User.php | 10 +++++-----
 _sakura/sakura.php          |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/_sakura/changelog.json b/_sakura/changelog.json
index e0bddd6..78c1356 100644
--- a/_sakura/changelog.json
+++ b/_sakura/changelog.json
@@ -3096,6 +3096,17 @@
                 "user":     "Flashwave"
             }
 
+        ],
+
+        "20151011": [
+
+            "eminence",
+            {
+                "type":     "FIX",
+                "change":   "Fixed incorrect id references.",
+                "user":     "Flashwave"
+            }
+
         ]
 
     }
diff --git a/_sakura/components/User.php b/_sakura/components/User.php
index 176c38c..41fb65c 100644
--- a/_sakura/components/User.php
+++ b/_sakura/components/User.php
@@ -409,7 +409,7 @@ class User
 
         // Check if anything was returned
         if ($getInUse) {
-            return [0, 'IN_USE', $getInUse['id']];
+            return [0, 'IN_USE', $getInUse['user_id']];
         }
 
         // Insert into username_history table
@@ -429,7 +429,7 @@ class User
                 'username_clean' => $username_clean,
             ],
             [
-                'id' => [$this->data['user_id'], '='],
+                'user_id' => [$this->data['user_id'], '='],
             ],
         ]);
 
@@ -454,7 +454,7 @@ class User
 
         // Check if anything was returned
         if ($getInUse) {
-            return [0, 'IN_USE', $getInUse['id']];
+            return [0, 'IN_USE', $getInUse['user_id']];
         }
 
         // Update userrow
@@ -463,7 +463,7 @@ class User
                 'email' => $email,
             ],
             [
-                'id' => [$this->data['user_id'], '='],
+                'user_id' => [$this->data['user_id'], '='],
             ],
         ]);
 
@@ -517,7 +517,7 @@ class User
                 'password_chan' => time(),
             ],
             [
-                'id' => [$this->data['user_id'], '='],
+                'user_id' => [$this->data['user_id'], '='],
             ],
         ]);
 
diff --git a/_sakura/sakura.php b/_sakura/sakura.php
index da831fe..cb062d7 100644
--- a/_sakura/sakura.php
+++ b/_sakura/sakura.php
@@ -8,7 +8,7 @@
 namespace Sakura;
 
 // Define Sakura version
-define('SAKURA_VERSION', '20151010');
+define('SAKURA_VERSION', '20151011');
 define('SAKURA_VLABEL', 'Eminence');
 define('SAKURA_COLOUR', '#6C3082');
 define('SAKURA_STABLE', false);