diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-03-29 09:03:53 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-03-29 09:03:53 -0700 |
| commit | f5490ddcb051b4996b155afc956238b8d3d6dc72 (patch) | |
| tree | 989335f713fc7e10a83421e167c6404bf561137c | |
| parent | 0c1595d7e8c1b31e886ac712ce7e794cf3c33fdd (diff) | |
| parent | ea43c5f06f5c7242f1d5811fe427e55c87497ecc (diff) | |
Merge branch 'master' into talmdal_dev
| -rw-r--r-- | modules/g2_import/helpers/g2_import.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php index 9c20ec4d..456c13c4 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -587,6 +587,7 @@ class g2_import_Core { if (in_array($g2_item->getMimeType(), array("video/mp4", "video/x-flv"))) { try { $item = ORM::factory("item"); + $item->type = "movie"; $item->parent_id = $parent->id; $item->set_data_file($g2_path); $item->name = $g2_item->getPathComponent(); |