From d12670ce84bd74feeb82e3d9c7a3f9a944bfed9e Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Wed, 22 Oct 2014 16:37:32 +0200
Subject: Fixed several things for successful up and download of images after
 using all arguments of database.

---
 src/main/java/org/openslx/satellitedaemon/db/DbUser.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org/openslx/satellitedaemon/db/DbUser.java')

diff --git a/src/main/java/org/openslx/satellitedaemon/db/DbUser.java b/src/main/java/org/openslx/satellitedaemon/db/DbUser.java
index deebd66..3aa57d2 100644
--- a/src/main/java/org/openslx/satellitedaemon/db/DbUser.java
+++ b/src/main/java/org/openslx/satellitedaemon/db/DbUser.java
@@ -24,8 +24,8 @@ public class DbUser
 	 */
 	public static DbUser getUserById(String userId) {
 		return MySQL.findUniqueOrNull( DbUser.class, "SELECT user.userID, user.Vorname AS firstName, " +
-				"user.Nachname AS lastName, user.mail AS email, user.institution" +
-				"FROM m_user user" +
+				"user.Nachname AS lastName, user.mail AS email, user.institution " +
+				"FROM m_user user " +
 				"WHERE userID = ?", userId );
 	}
 }
-- 
cgit v1.2.3-55-g7522