a couple of trivial cleanups: check to see if order is empty in addition to null...

diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java
index 4871f66..d242516 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleUploadedMedia.java
+++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java
@@ -68,7 +68,7 @@ import java.util.HashMap;
  *  ServletModuleBilder -
  *  liefert HTML fuer Bilder
  *
- * @version $Id: ServletModuleUploadedMedia.java,v 1.8.2.3 2002/11/27 07:05:47 mh Exp $
+ * @version $Id: ServletModuleUploadedMedia.java,v 1.8.2.4 2002/12/10 10:01:50 mh Exp $
  * @author RK, the mir-coders group
  */
 
@@ -173,7 +173,7 @@ public abstract class ServletModuleUploadedMedia
     mergeData.put("offset", offset);
 
     String order = req.getParameter("order");
-    if (order == null) order = "webdb_lastchange desc";
+    if (order == null || order.equals("")) order = "webdb_lastchange desc";
 
     // if in connection mode to content
     String cid = req.getParameter("cid");
@@ -200,22 +200,20 @@ public abstract class ServletModuleUploadedMedia
 
     // fetch und ausliefern
     try {
-      if (query_text != null || query_is_published != null || query_media_folder != null) {
-        EntityList theList = mainModule.getByWhereClause(whereClause, order, (new Integer(offset)).intValue(), 10);
-        if (theList != null) {
-          mergeData.put("contentlist", theList);
-          if (theList.getOrder() != null) {
-            mergeData.put("order", theList.getOrder());
-            mergeData.put("order_encoded", URLEncoder.encode(theList.getOrder()));
-          }
-          mergeData.put("count", (new Integer(theList.getCount())).toString());
-          mergeData.put("from", (new Integer(theList.getFrom())).toString());
-          mergeData.put("to", (new Integer(theList.getTo())).toString());
-          if (theList.hasNextBatch())
-            mergeData.put("next", (new Integer(theList.getNextBatch())).toString());
-          if (theList.hasPrevBatch())
-            mergeData.put("prev", (new Integer(theList.getPrevBatch())).toString());
+      EntityList theList = mainModule.getByWhereClause(whereClause, order, (new Integer(offset)).intValue(), 10);
+      if (theList != null) {
+        mergeData.put("contentlist", theList);
+        if (theList.getOrder() != null) {
+          mergeData.put("order", theList.getOrder());
+          mergeData.put("order_encoded", URLEncoder.encode(theList.getOrder()));
         }
+        mergeData.put("count", (new Integer(theList.getCount())).toString());
+        mergeData.put("from", (new Integer(theList.getFrom())).toString());
+        mergeData.put("to", (new Integer(theList.getTo())).toString());
+        if (theList.hasNextBatch())
+          mergeData.put("next", (new Integer(theList.getNextBatch())).toString());
+        if (theList.hasPrevBatch())
+          mergeData.put("prev", (new Integer(theList.getPrevBatch())).toString());
       }
       //fetch the popups
       popups.put("mediafolderPopupData", DatabaseMediafolder.getInstance().getPopupData());