--- a/dbdefs.inc.php	Tue Nov 25 23:49:41 2014 +0200
+++ b/dbdefs.inc.php	Tue Nov 25 23:54:38 2014 +0200
@@ -1,6 +1,6 @@
 <?
 
-$dbVersion = 25;
+$dbVersion = 26;
 
 //
 // Site settings and defaults we put in
@@ -284,8 +284,8 @@
     array("notes"        , "VARCHAR(".SET_LEN_ENTRY_NOTES.")", "DEFAULT NULL"),
     array("flags"        , "INT", "DEFAULT 0"),
     array("evalue"       , "INT", "DEFAULT 0"),
-    array("file_id"      , "INT", "DEFAULT 0"), // currently default file from "files" table
-    array("preview_id"   , "INT", "DEFAULT 0"), // currently default preview from "files" table
+    array("file_id"      , "INT", "DEFAULT 0"), // uploaded file id from "files" table
+    array("preview_id"   , "INT", "DEFAULT 0"), // uploaded preview file id from "files" table
     array("preview_type" , "INT", "DEFAULT 0"), // see EPREV_*, overrides compo's general type if != 0
     array("utime"        , "INT", "DEFAULT 0"),
     array("owner_id"     , "INT", "DEFAULT 0"), // 0 = admin, otherwise votekey id
@@ -293,13 +293,12 @@
 
   "files" => array(
     array("id"           , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
-    array("orig_filename", "VARCHAR(".SET_LEN_ENTRY_FILENAME.")", "DEFAULT NULL"), // original uploaded filename
     array("filename"     , "VARCHAR(".SET_LEN_ENTRY_FILENAME.")", "DEFAULT NULL"), // stored filename
+    array("origname"     , "VARCHAR(".SET_LEN_ENTRY_FILENAME.")", "DEFAULT NULL"), // original uploaded filename
     array("filetype"     , "VARCHAR(32)", "DEFAULT NULL"), // type of the file, if any, as key from $fileTypeData
     array("filesize"     , "INT", "DEFAULT 0"), // uploaded size
     array("entry_id"     , "INT", "DEFAULT 0"), // belongs to this entry (0 = none)
     array("uploader_id"  , "INT", "DEFAULT 0"), // 0 = admin, otherwise votekey id
-    array("deleted"      , "INT", "DEFAULT 0"), // 0 = ok, 1 = to be deleted (don't show in filelists)
     array("utime"        , "INT", "DEFAULT 0"),
   ),