X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2FMir.java;h=b42796d55022e65e6839c59e5892d895cf5fd593;hb=ee8b3029d4c4d88cad33d76ab05e28ce9d0f1d80;hp=dd8f373a6eb4ee33686a6751b31c3e1580b53ce0;hpb=038c5989199f1bf0490500b117e1bd641df10ef0;p=mir.git diff --git a/source/Mir.java b/source/Mir.java index dd8f373a..b42796d5 100755 --- a/source/Mir.java +++ b/source/Mir.java @@ -13,6 +13,7 @@ import mircoders.localizer.*; import mircoders.entity.EntityUsers; import mircoders.module.ModuleMessage; import mircoders.module.ModuleUsers; +import mircoders.storage.DatabaseArticleType; import mircoders.storage.DatabaseMessages; import mircoders.storage.DatabaseUsers; @@ -304,7 +305,7 @@ public class Mir extends AbstractServlet { if (messageModule == null) messageModule = new ModuleMessage(DatabaseMessages.getInstance()); mergeData.put("messages", messageModule.getByWhereClause(null, "webdb_create desc", 0, 10)); - + mergeData.put("articletypes", DatabaseArticleType.getInstance().selectByWhereClause("", "id", 0, 20)); SimpleList producersData = new SimpleList(); Iterator i = MirGlobal.localizer().producers().factories().entrySet().iterator(); @@ -323,7 +324,6 @@ public class Mir extends AbstractServlet { producersData.add(producerData); } - mergeData.put("producers", producersData);