*** empty log message ***

[mir.git] / source / mircoders / servlet / ServletModuleContent.java

diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java
index a438ad8..ce22cc1 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleContent.java
+++ b/source/mircoders/servlet/ServletModuleContent.java
@@ -167,7 +167,7 @@ public class ServletModuleContent extends ServletModule
       throw new ServletModuleException("language/schwerpunkt list could not be fetched.: "
         +e.toString());
     }
-    mergeData.put("login_user", HTMLTemplateProcessor.makeSimpleHash(user));
+    mergeData.put("login_user", user);
     deliver(req, res, mergeData, templateObjektString);
   }
 
@@ -359,7 +359,7 @@ public class ServletModuleContent extends ServletModule
       SimpleHash mergeData =  HTMLTemplateProcessor.makeSimpleHash(entContent);
       EntityList topicToContent = DatabaseContentToTopics.getInstance().getTopics(entContent);
       if (topicToContent!=null && topicToContent.size()>0){
-        theLog.printDebugInfo("topicanzahl: "+topicToContent.size());
+        //theLog.printDebugInfo("topicanzahl: "+topicToContent.size());
         Entity topics = null;
         SimpleList topicList = new SimpleList();
         for(int i=0;i<topicToContent.size();i++){
@@ -395,7 +395,7 @@ public class ServletModuleContent extends ServletModule
       if ((offsetParam = req.getParameter("offset"))!=null) mergeData.put("offset", offsetParam);
       if ((whereParam = req.getParameter("where"))!=null) mergeData.put("where", whereParam);
       if ((orderParam = req.getParameter("order"))!=null) mergeData.put("order", orderParam);
-      mergeData.put("login_user", HTMLTemplateProcessor.makeSimpleHash(_getUser(req)));
+      mergeData.put("login_user", _getUser(req));
       deliver(req, res, mergeData, templateObjektString);
     } catch (Exception e) {
       throw new ServletModuleException(e.toString());