media handling fixes, gotten rid of StorageObject, set the default method for blots...

[mir.git] / source / mircoders / module / ModuleContent.java

diff --git a/source/mircoders/module/ModuleContent.java b/source/mircoders/module/ModuleContent.java
index d3877d5..847dc58 100755 (executable)
--- a/source/mircoders/module/ModuleContent.java
+++ b/source/mircoders/module/ModuleContent.java
@@ -78,7 +78,7 @@ public class ModuleContent extends AbstractModule
       if (!aForce)
         query = query + " and to_locking_user is null";
 
-      return storage.executeUpdate(query) > 0;
+      return database.executeUpdate(query) > 0;
     }
     catch (Throwable t) {
       return false;
@@ -103,7 +103,7 @@ public class ModuleContent extends AbstractModule
       if (!aForce)
         query = query + " and to_locking_user = "+JDBCStringRoutines.escapeStringLiteral(aUserId);
 
-      return storage.executeUpdate(query) > 0;
+      return database.executeUpdate(query) > 0;
     }
     catch (Throwable t) {
       return false;
@@ -118,7 +118,7 @@ public class ModuleContent extends AbstractModule
    */
   public String queryArticleLock(String anId)  {
     try {
-      String result = storage.executeFreeSingleValueSql("select to_locking_user from content where id = " + JDBCStringRoutines.escapeStringLiteral(anId));
+      String result = database.executeFreeSingleValueSql("select to_locking_user from content where id = " + JDBCStringRoutines.escapeStringLiteral(anId));
 
       if (result!=null && !MirGlobal.isUserLoggedIn(result)) {
         expireArticleLock(anId, result);