From 9730c9768314ddd759d59853cd21986fc7710a2f Mon Sep 17 00:00:00 2001
From: Roman Hergenreder <mail@romanh.de>
Date: Sun, 9 Aug 2020 14:23:36 +0200
Subject: [PATCH] Bugfix AcceptInvite

---
 core/Api/UserAPI.class.php | 5 +++--
 core/core.php              | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/Api/UserAPI.class.php b/core/Api/UserAPI.class.php
index 1e5fc28..a759fb9 100644
--- a/core/Api/UserAPI.class.php
+++ b/core/Api/UserAPI.class.php
@@ -787,7 +787,7 @@ namespace Api\User {
 
     private function checkToken($token) {
       $sql = $this->user->getSQL();
-      $res = $sql->select("UserToken.token_type", "User.uid", "User.name", "User.email")
+      $res = $sql->select("UserToken.token_type", "User.uid", "User.name", "User.email", "User.confirmed")
         ->from("UserToken")
         ->innerJoin("User", "UserToken.user_id", "User.uid")
         ->where(new Compare("UserToken.token", $token))
@@ -821,7 +821,8 @@ namespace Api\User {
           $this->result["user"] = array(
             "name" => $tokenEntry["name"],
             "email" => $tokenEntry["email"],
-            "uid" => $tokenEntry["uid"]
+            "uid" => $tokenEntry["uid"],
+            "confirmed" => $tokenEntry["confirmed"]
           );
         } else {
           return $this->createError("This token does not exist or is no longer valid");
diff --git a/core/core.php b/core/core.php
index 7dda269..f456348 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1,6 +1,6 @@
 <?php
 
-define("WEBBASE_VERSION", "1.0.3");
+define("WEBBASE_VERSION", "1.0.4");
 
 function getProtocol() {
   return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) ? "https" : "http";