From be9a8d3fda49d79e5aa8a85cca6b4627b5688b6e Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Mon, 15 Jul 2013 09:05:44 +0200
Subject: [PATCH] Go through activiation even for admin accounts

Fixes an issue with accounts being locked after trying to activate it.

Addresses #330
---
 public/include/classes/user.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/include/classes/user.class.php b/public/include/classes/user.class.php
index 9927ac30..ef640098 100644
--- a/public/include/classes/user.class.php
+++ b/public/include/classes/user.class.php
@@ -421,7 +421,7 @@ class User {
    * @param userID int User ID
    * return data array Database fields as used in SELECT
    **/
-  public function getUserData($userID) {
+  public function getUserData($userID) e
     $this->debug->append("STA " . __METHOD__, 4);
     $this->debug->append("Fetching user information for user id: $userID");
     $stmt = $this->mysqli->prepare("
@@ -495,7 +495,6 @@ class User {
         VALUES (?, ?, ?, ?, ?, ?)
         ");
     } else {
-      $is_locked = 0;
       $stmt = $this->mysqli->prepare("
         INSERT INTO $this->table (username, pass, email, pin, api_key, is_admin, is_locked)
         VALUES (?, ?, ?, ?, ?, 1, ?)