r20151011

Signed-off-by: Flashwave <me@flash.moe>

_sakura/changelog.json

@@ -3096,6 +3096,17 @@
                 "user":     "Flashwave"
             }
 
+        ],
+
+        "20151011": [
+
+            "eminence",
+            {
+                "type":     "FIX",
+                "change":   "Fixed incorrect id references.",
+                "user":     "Flashwave"
+            }
+
         ]
 
     }

_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'], '='],
             ],
         ]);
 

_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);