diff --git a/modules/file/file.class.php b/modules/file/file.class.php
index 82fd71563..5fb2c9e1e 100644
--- a/modules/file/file.class.php
+++ b/modules/file/file.class.php
@@ -89,7 +89,7 @@ class file extends ModuleObject
{
return true;
}
- if(!$oDB->isColumnExists('files', 'type'))
+ if(!$oDB->isColumnExists('files', 'mime_type'))
{
return true;
}
@@ -188,14 +188,14 @@ class file extends ModuleObject
{
$oDB->addColumn('files', 'thumbnail_filename', 'varchar', '250', null, false, 'uploaded_filename');
}
- if(!$oDB->isColumnExists('files', 'type'))
+ if(!$oDB->isColumnExists('files', 'mime_type'))
{
- $oDB->addColumn('files', 'type', 'varchar', '60', '', true, 'thumbnail_filename');
- $oDB->addIndex('files', 'idx_type', 'type');
+ $oDB->addColumn('files', 'mime_type', 'varchar', '60', '', true, 'file_size');
+ $oDB->addIndex('files', 'idx_mime_type', 'mime_type');
}
if(!$oDB->isColumnExists('files', 'original_type'))
{
- $oDB->addColumn('files', 'original_type', 'varchar', '60', null, false, 'type');
+ $oDB->addColumn('files', 'original_type', 'varchar', '60', null, false, 'mime_type');
}
if(!$oDB->isColumnExists('files', 'width'))
{
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index f7677cb4c..b2c25c471 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -955,14 +955,14 @@ class fileController extends file
$args->member_srl = Rhymix\Framework\Session::getMemberSrl();
$args->source_filename = $file_info['name'];
$args->sid = Rhymix\Framework\Security::getRandom(32, 'hex');
- $args->type = $file_info['type'];
+ $args->mime_type = $file_info['type'];
$args->width = $file_info['width'];
$args->height = $file_info['height'];
$args->duration = $file_info['duration'];
// Set original type if file type is changed
$args->original_type = null;
- if($args->type !== $file_info['original_type'])
+ if($args->mime_type !== $file_info['original_type'])
{
$args->original_type = $file_info['original_type'];
}
diff --git a/modules/file/queries/insertFile.xml b/modules/file/queries/insertFile.xml
index 94d4e33d8..f4bdc9317 100644
--- a/modules/file/queries/insertFile.xml
+++ b/modules/file/queries/insertFile.xml
@@ -7,22 +7,22 @@
+
+
+
-
+
+
-
-
-
-
+
-
diff --git a/modules/file/schemas/files.xml b/modules/file/schemas/files.xml
index c30eb471a..94c9b7586 100644
--- a/modules/file/schemas/files.xml
+++ b/modules/file/schemas/files.xml
@@ -10,12 +10,12 @@
-
+
+
-