diff options
author | Joar Wandborg <git@wandborg.com> | 2011-11-22 00:09:41 +0100 |
---|---|---|
committer | Joar Wandborg <git@wandborg.com> | 2011-11-22 00:09:41 +0100 |
commit | 8aeb6738774f6428312bd0889e2aaf4fc9445da0 (patch) | |
tree | 9f5ad6d3b59b4ff97482ee0ccf4a586b9d03d0a7 /mediagoblin/media_types | |
parent | 0bce749b21595fb0e33e2a109902b71e4611d483 (diff) | |
download | mediagoblin-8aeb6738774f6428312bd0889e2aaf4fc9445da0.tar.lz mediagoblin-8aeb6738774f6428312bd0889e2aaf4fc9445da0.tar.xz mediagoblin-8aeb6738774f6428312bd0889e2aaf4fc9445da0.zip |
Video support is disabled by default, set enable_video to true to enable
Diffstat (limited to 'mediagoblin/media_types')
-rw-r--r-- | mediagoblin/media_types/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mediagoblin/media_types/__init__.py b/mediagoblin/media_types/__init__.py index 2d13f5a6..a2ea6bcb 100644 --- a/mediagoblin/media_types/__init__.py +++ b/mediagoblin/media_types/__init__.py @@ -17,6 +17,7 @@ import os import sys +from mediagoblin import mg_globals from mediagoblin.util import lazy_pass_to_ugettext as _ @@ -29,8 +30,10 @@ class InvalidFileType(Exception): # This should be more dynamic in the future. Perhaps put it in the .ini? # -- Joar MEDIA_TYPES = [ - 'mediagoblin.media_types.image', - 'mediagoblin.media_types.video'] + 'mediagoblin.media_types.image'] + +if mg_globals.app_config['enable_video']: + MEDIA_TYPES.append('mediagoblin.media_types.video') def get_media_types(): |