important bugfix: new article produced a form without values for the various

lists (like article type, topic etc). This is fixed now.

diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java
index 7f5cb12..a3b3cc2 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleContent.java
+++ b/source/mircoders/servlet/ServletModuleContent.java
@@ -143,32 +143,34 @@ public class ServletModuleContent extends ServletModule
 
     EntityUsers   user = _getUser(req);
     SimpleHash mergeData = new SimpleHash();
+    SimpleHash extraInfo = new SimpleHash();
+
     mergeData.put("new", "1");
     mergeData.put("is_published", "1");
     String now = StringUtil.date2webdbDate(new GregorianCalendar());
     mergeData.put("date", new SimpleScalar(now));
     try {
-    mergeData.put("themenPopupData", themenModule.getTopicsAsSimpleList());
+    extraInfo.put("themenPopupData", themenModule.getTopicsAsSimpleList());
     } catch (ModuleException e) {
       theLog.printError("themenPopupData could not be fetched.");
     }
     try {
-      mergeData.put("articletypePopupData", DatabaseArticleType.getInstance().getPopupData());
+      extraInfo.put("articletypePopupData", DatabaseArticleType.getInstance().getPopupData());
     } catch (Exception e) {
       theLog.printError("articletype could not be fetched.");
     }
     try {
-      mergeData.put("languagePopupData", DatabaseLanguage.getInstance().getPopupData());
+      extraInfo.put("languagePopupData", DatabaseLanguage.getInstance().getPopupData());
     } catch (Exception e) {
       theLog.printError("language-popup could not be fetched.");
     }
     try {
-    mergeData.put("schwerpunktPopupData", schwerpunktModule.getSchwerpunktAsSimpleList());
+      extraInfo.put("schwerpunktPopupData", schwerpunktModule.getSchwerpunktAsSimpleList());
     } catch (ModuleException e) {
       theLog.printError("schwerpunktPopupData could not be fetched.");
     }
-    mergeData.put("login_user", user);
-    deliver(req, res, mergeData, templateObjektString);
+    extraInfo.put("login_user", user);
+    deliver(req, res, mergeData, extraInfo, templateObjektString);
   }